Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git] / Documentation / kernel-parameters.txt
index d9a452e8fb9b3bb1f34d89ddaa87cb8dd90b04bd..04e9f5505faa8fa4133c198a946cdefab241824d 100644 (file)
@@ -656,7 +656,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Sets the size of kernel global memory area for
                        contiguous memory allocations and optionally the
                        placement constraint by the physical address range of
-                       memory allocations. For more information, see
+                       memory allocations. A value of 0 disables CMA
+                       altogether. For more information, see
                        include/linux/dma-contiguous.h
 
        cmo_free_hint=  [PPC] Format: { yes | no }
@@ -1322,7 +1323,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Set number of hash buckets for inode cache.
 
        ima_appraise=   [IMA] appraise integrity measurements
-                       Format: { "off" | "enforce" | "fix" }
+                       Format: { "off" | "enforce" | "fix" | "log" }
                        default: "enforce"
 
        ima_appraise_tcb [IMA]
@@ -1722,6 +1723,49 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        lockd.nlm_udpport=M     [NFS] Assign UDP port.
                        Format: <integer>
 
+       locktorture.nreaders_stress= [KNL]
+                       Set the number of locking read-acquisition kthreads.
+                       Defaults to being automatically set based on the
+                       number of online CPUs.
+
+       locktorture.nwriters_stress= [KNL]
+                       Set the number of locking write-acquisition kthreads.
+
+       locktorture.onoff_holdoff= [KNL]
+                       Set time (s) after boot for CPU-hotplug testing.
+
+       locktorture.onoff_interval= [KNL]
+                       Set time (s) between CPU-hotplug operations, or
+                       zero to disable CPU-hotplug testing.
+
+       locktorture.shuffle_interval= [KNL]
+                       Set task-shuffle interval (jiffies).  Shuffling
+                       tasks allows some CPUs to go into dyntick-idle
+                       mode during the locktorture test.
+
+       locktorture.shutdown_secs= [KNL]
+                       Set time (s) after boot system shutdown.  This
+                       is useful for hands-off automated testing.
+
+       locktorture.stat_interval= [KNL]
+                       Time (s) between statistics printk()s.
+
+       locktorture.stutter= [KNL]
+                       Time (s) to stutter testing, for example,
+                       specifying five seconds causes the test to run for
+                       five seconds, wait for five seconds, and so on.
+                       This tests the locking primitive's ability to
+                       transition abruptly to and from idle.
+
+       locktorture.torture_runnable= [BOOT]
+                       Start locktorture running at boot time.
+
+       locktorture.torture_type= [KNL]
+                       Specify the locking implementation to test.
+
+       locktorture.verbose= [KNL]
+                       Enable additional printk() statements.
+
        logibm.irq=     [HW,MOUSE] Logitech Bus Mouse Driver
                        Format: <irq>
 
@@ -2899,6 +2943,24 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Lazy RCU callbacks are those which RCU can
                        prove do nothing more than free memory.
 
+       rcutorture.cbflood_inter_holdoff= [KNL]
+                       Set holdoff time (jiffies) between successive
+                       callback-flood tests.
+
+       rcutorture.cbflood_intra_holdoff= [KNL]
+                       Set holdoff time (jiffies) between successive
+                       bursts of callbacks within a given callback-flood
+                       test.
+
+       rcutorture.cbflood_n_burst= [KNL]
+                       Set the number of bursts making up a given
+                       callback-flood test.  Set this to zero to
+                       disable callback-flood testing.
+
+       rcutorture.cbflood_n_per_burst= [KNL]
+                       Set the number of callbacks to be registered
+                       in a given burst of a callback-flood test.
+
        rcutorture.fqs_duration= [KNL]
                        Set duration of force_quiescent_state bursts.
 
@@ -2938,7 +3000,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Set time (s) between CPU-hotplug operations, or
                        zero to disable CPU-hotplug testing.
 
-       rcutorture.rcutorture_runnable= [BOOT]
+       rcutorture.torture_runnable= [BOOT]
                        Start rcutorture running at boot time.
 
        rcutorture.shuffle_interval= [KNL]
@@ -3000,6 +3062,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        rcupdate.rcu_cpu_stall_timeout= [KNL]
                        Set timeout for RCU CPU stall warning messages.
 
+       rcupdate.rcu_task_stall_timeout= [KNL]
+                       Set timeout in jiffies for RCU task stall warning
+                       messages.  Disable with a value less than or equal
+                       to zero.
+
        rdinit=         [KNL]
                        Format: <full_path>
                        Run specified binary instead of /init from the ramdisk,
@@ -3158,6 +3225,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        slram=          [HW,MTD]
 
+       slab_nomerge    [MM]
+                       Disable merging of slabs with similar size. May be
+                       necessary if there is some reason to distinguish
+                       allocs to different slabs. Debug options disable
+                       merging on their own.
+                       For more information see Documentation/vm/slub.txt.
+
        slab_max_order= [MM, SLAB]
                        Determines the maximum allowed order for slabs.
                        A high setting may cause OOMs due to memory
@@ -3193,11 +3267,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        For more information see Documentation/vm/slub.txt.
 
        slub_nomerge    [MM, SLUB]
-                       Disable merging of slabs with similar size. May be
-                       necessary if there is some reason to distinguish
-                       allocs to different slabs. Debug options disable
-                       merging on their own.
-                       For more information see Documentation/vm/slub.txt.
+                       Same with slab_nomerge. This is supported for legacy.
+                       See slab_nomerge for more information.
 
        smart2=         [HW]
                        Format: <io1>[,<io2>[,...,<io8>]]
@@ -3321,11 +3392,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        tdfx=           [HW,DRM]
 
-       test_suspend=   [SUSPEND]
+       test_suspend=   [SUSPEND][,N]
                        Specify "mem" (for Suspend-to-RAM) or "standby" (for
-                       standby suspend) as the system sleep state to briefly
-                       enter during system startup.  The system is woken from
-                       this state using a wakeup-capable RTC alarm.
+                       standby suspend) or "freeze" (for suspend type freeze)
+                       as the system sleep state during system startup with
+                       the optional capability to repeat N number of times.
+                       The system is woken from this state using a
+                       wakeup-capable RTC alarm.
 
        thash_entries=  [KNL,NET]
                        Set number of hash buckets for TCP connection