From 1fc9dade9677b1101037640215fc899f2c8803b6 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Mon, 17 Dec 2012 15:59:29 -0800 Subject: [PATCH] --- yaml --- r: 346344 b: refs/heads/master c: fbb97d87802247a7bb32a207a8275372e79e6b88 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index de84f209f239..57c47d59407c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3515b737d3c1377874c5cba8b7db3d2477da3af3 +refs/heads/master: fbb97d87802247a7bb32a207a8275372e79e6b88 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index ea8e5b485576..ddd84d627185 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/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.