Merge tag 'iwlwifi-for-john-2014-11-03' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git] / Documentation / kernel-parameters.txt
index 41f7ec1..7dbe5ec 100644 (file)
@@ -605,11 +605,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        See Documentation/s390/CommonIO for details.
        clk_ignore_unused
                        [CLK]
-                       Keep all clocks already enabled by bootloader on,
-                       even if no driver has claimed them. This is useful
-                       for debug and development, but should not be
-                       needed on a platform with proper driver support.
-                       For more information, see Documentation/clk.txt.
+                       Prevents the clock framework from automatically gating
+                       clocks that have not been explicitly enabled by a Linux
+                       device driver but are enabled in hardware at reset or
+                       by the bootloader/firmware. Note that this does not
+                       force such clocks to be always-on nor does it reserve
+                       those clocks in any way. This parameter is useful for
+                       debug and development, but should not be needed on a
+                       platform with proper driver support.  For more
+                       information, see Documentation/clk.txt.
 
        clock=          [BUGS=X86-32, HW] gettimeofday clocksource override.
                        [Deprecated]
@@ -1256,7 +1260,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        i8042.noloop    [HW] Disable the AUX Loopback command while probing
                             for the AUX port
        i8042.nomux     [HW] Don't check presence of an active multiplexing
-                            controller
+                            controller. Default: true.
        i8042.nopnp     [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
                             controllers
        i8042.notimeout [HW] Ignore timeout condition signalled by controller
@@ -1323,7 +1327,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]
@@ -1723,6 +1727,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>
 
@@ -2900,6 +2947,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.
 
@@ -2939,7 +3004,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]
@@ -3001,6 +3066,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,