diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-22 12:38:34 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-22 12:38:34 -0500 |
| commit | 899a1fc084ef3dcb57737d8847bf219cbf353ed3 (patch) | |
| tree | a9dc1c8530524e0ac345f06de6df105f847a7604 /Documentation | |
| parent | c64d472abc68dcad4d34f365545058c3f11973d8 (diff) | |
| parent | 989e4d6cbc69191c41ddf4b1c492457410376b43 (diff) | |
| download | kernel-crypto-899a1fc084ef3dcb57737d8847bf219cbf353ed3.tar.gz kernel-crypto-899a1fc084ef3dcb57737d8847bf219cbf353ed3.tar.xz kernel-crypto-899a1fc084ef3dcb57737d8847bf219cbf353ed3.zip | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/kernel-api.tmpl | 6 | ||||
| -rw-r--r-- | Documentation/arm/memory.txt | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index 096aed62c32..767433bdbc4 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl @@ -237,8 +237,10 @@ X!Ilib/string.c <sect1><title>Driver Support</title> !Enet/core/dev.c !Enet/ethernet/eth.c -!Einclude/linux/etherdevice.h -!Enet/core/wireless.c +!Iinclude/linux/etherdevice.h +<!-- FIXME: Removed for now since no structured comments in source +X!Enet/core/wireless.c +--> </sect1> <sect1><title>Synchronous PPP</title> !Edrivers/net/wan/syncppp.c diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt index 4b1c93a8177..dc6045577a8 100644 --- a/Documentation/arm/memory.txt +++ b/Documentation/arm/memory.txt @@ -1,7 +1,7 @@ Kernel Memory Layout on ARM Linux Russell King <rmk@arm.linux.org.uk> - May 21, 2004 (2.6.6) + November 17, 2005 (2.6.15) This document describes the virtual memory layout which the Linux kernel uses for ARM processors. It indicates which regions are @@ -37,6 +37,8 @@ ff000000 ffbfffff Reserved for future expansion of DMA mapping region. VMALLOC_END feffffff Free for platform use, recommended. + VMALLOC_END must be aligned to a 2MB + boundary. VMALLOC_START VMALLOC_END-1 vmalloc() / ioremap() space. Memory returned by vmalloc/ioremap will |