Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / Documentation / x86_64 / boot-options.txt

diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 7500aad95f3ceaf70a0d546488c9231751731f3c..6177d881983fa701f4df08f9ad55c6b21db6a02e 100644 (file)
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -153,9 +153,15 @@ NUMA
                If a number, fakes CMDLINE nodes and ignores NUMA setup of the
                actual machine.  Otherwise, system memory is configured
                depending on the sizes and coefficients listed.  For example:
-                       numa=fake=2*512,1024,4*256
-               gives two 512M nodes, a 1024M node, and four 256M nodes.  The
-               remaining system RAM is allocated to an additional node.
+                       numa=fake=2*512,1024,4*256,*128
+               gives two 512M nodes, a 1024M node, four 256M nodes, and the
+               rest split into 128M chunks.  If the last character of CMDLINE
+               is a *, the remaining memory is divided up equally among its
+               coefficient:
+                       numa=fake=2*512,2*
+               gives two 512M nodes and the rest split into two nodes.
+               Otherwise, the remaining system RAM is allocated to an
+               additional node.
 
   numa=hotadd=percent
                Only allow hotadd memory to preallocate page structures upto