Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 479f332..eacb2e0 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1446,6 +1446,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                       disable
                         Do not enable intel_pstate as the default
                         scaling driver for the supported processors
+                      no_hwp
+                        Do not enable hardware P state control (HWP)
+                        if available.
 
        intremap=       [X86-64, Intel-IOMMU]
                        on      enable Interrupt Remapping (default)
@@ -2509,6 +2512,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        timeout < 0: reboot immediately
                        Format: <timeout>
 
+       panic_on_warn   panic() instead of WARN().  Useful to cause kdump
+                       on a WARN().
+
        crash_kexec_post_notifiers
                        Run kdump after running panic-notifiers and dumping
                        kmsg. This only for the users who doubt kdump always
@@ -2940,6 +2946,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        quiescent states.  Units are jiffies, minimum
                        value is one, and maximum value is HZ.
 
+       rcutree.kthread_prio=    [KNL,BOOT]
+                       Set the SCHED_FIFO priority of the RCU
+                       per-CPU kthreads (rcuc/N). This value is also
+                       used for the priority of the RCU boost threads
+                       (rcub/N). Valid values are 1-99 and the default
+                       is 1 (the least-favored priority).
+
        rcutree.rcu_nocb_leader_stride= [KNL]
                        Set the number of NOCB kthread groups, which
                        defaults to the square root of the number of
@@ -3089,6 +3102,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        messages.  Disable with a value less than or equal
                        to zero.
 
+       rcupdate.rcu_self_test= [KNL]
+                       Run the RCU early boot self tests
+
+       rcupdate.rcu_self_test_bh= [KNL]
+                       Run the RCU bh early boot self tests
+
+       rcupdate.rcu_self_test_sched= [KNL]
+                       Run the RCU sched early boot self tests
+
        rdinit=         [KNL]
                        Format: <full_path>
                        Run specified binary instead of /init from the ramdisk,
@@ -3501,7 +3523,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        are saved.
 
        trace_buf_size=nn[KMG]
-                       [FTRACE] will set tracing buffer size.
+                       [FTRACE] will set tracing buffer size on each cpu.
 
        trace_event=[event-list]
                        [FTRACE] Set and start specified trace events in order