aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorWen Congyang <wency@cn.fujitsu.com>2012-12-17 18:59:29 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 20:15:12 -0500
commitfbb97d87802247a7bb32a207a8275372e79e6b88 (patch)
tree17d48c19edc1e8d703b13a64c2abcded3ab07b75 /Documentation/kernel-parameters.txt
parent3515b737d3c1377874c5cba8b7db3d2477da3af3 (diff)
Documentation/kernel-parameters.txt: update mem= option's spec according to its implementation
Current mem= implementation seems buggy because the specification and implementation don't match. The current mem= has been working for many years and it's not buggy - it works as expected. So we should update the specification. Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> Cc: Rob Landley <rob@landley.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ea8e5b485576..ddd84d627185 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1503,9 +1503,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
1503 mem=nn[KMG] [KNL,BOOT] Force usage of a specific amount of memory 1503 mem=nn[KMG] [KNL,BOOT] Force usage of a specific amount of memory
1504 Amount of memory to be used when the kernel is not able 1504 Amount of memory to be used when the kernel is not able
1505 to see the whole system memory or for test. 1505 to see the whole system memory or for test.
1506 [X86-32] Use together with memmap= to avoid physical 1506 [X86] Work as limiting max address. Use together
1507 address space collisions. Without memmap= PCI devices 1507 with memmap= to avoid physical address space collisions.
1508 could be placed at addresses belonging to unused RAM. 1508 Without memmap= PCI devices could be placed at addresses
1509 belonging to unused RAM.
1509 1510
1510 mem=nopentium [BUGS=X86-32] Disable usage of 4MB pages for kernel 1511 mem=nopentium [BUGS=X86-32] Disable usage of 4MB pages for kernel
1511 memory. 1512 memory.