Merge branch 'for-3.8' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ea8e5b4..ddd84d6 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1503,9 +1503,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        mem=nn[KMG]     [KNL,BOOT] Force usage of a specific amount of memory
                        Amount of memory to be used when the kernel is not able
                        to see the whole system memory or for test.
-                       [X86-32] Use together with memmap= to avoid physical
-                       address space collisions. Without memmap= PCI devices
-                       could be placed at addresses belonging to unused RAM.
+                       [X86] Work as limiting max address. Use together
+                       with memmap= to avoid physical address space collisions.
+                       Without memmap= PCI devices could be placed at addresses
+                       belonging to unused RAM.
 
        mem=nopentium   [BUGS=X86-32] Disable usage of 4MB pages for kernel
                        memory.