Pull vector-domain into release branch

[sfrench/cifs-2.6.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8363ad3ba0187f9abc65ab75c989e80bd0e70eed..854744bde2240298a1a44ecebe5fa506b8da80aa 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -817,6 +817,32 @@ and is between 256 and 4096 characters. It is defined in the file
        js=             [HW,JOY] Analog joystick
                        See Documentation/input/joystick.txt.
 
+       kernelcore=nn[KMG]      [KNL,IA-32,IA-64,PPC,X86-64] This parameter
+                       specifies the amount of memory usable by the kernel
+                       for non-movable allocations.  The requested amount is
+                       spread evenly throughout all nodes in the system. The
+                       remaining memory in each node is used for Movable
+                       pages. In the event, a node is too small to have both
+                       kernelcore and Movable pages, kernelcore pages will
+                       take priority and other nodes will have a larger number
+                       of kernelcore pages.  The Movable zone is used for the
+                       allocation of pages that may be reclaimed or moved
+                       by the page migration subsystem.  This means that
+                       HugeTLB pages may not be allocated from this zone.
+                       Note that allocations like PTEs-from-HighMem still
+                       use the HighMem zone if it exists, and the Normal
+                       zone if it does not.
+
+       movablecore=nn[KMG]     [KNL,IA-32,IA-64,PPC,X86-64] This parameter
+                       is similar to kernelcore except it specifies the
+                       amount of memory used for migratable allocations.
+                       If both kernelcore and movablecore is specified,
+                       then kernelcore will be at *least* the specified
+                       value but may be more. If movablecore on its own
+                       is specified, the administrator must be careful
+                       that the amount of memory usable for all allocations
+                       is not too small.
+
        keepinitrd      [HW,ARM]
 
        kstack=N        [IA-32,X86-64] Print N words from the kernel stack
@@ -1859,6 +1885,9 @@ and is between 256 and 4096 characters. It is defined in the file
                        vdso=1: enable VDSO (default)
                        vdso=0: disable VDSO mapping
 
+       vector=         [IA-64,SMP]
+                       vector=percpu: enable percpu vector domain
+
        video=          [FB] Frame buffer configuration
                        See Documentation/fb/modedb.txt.