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

[firefly-linux-kernel-4.4.55.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 838f3776c9249e2cd3d5e17c966f0fb4acdad796..eacb2e0397ae3f4e80428ef239d5b28faaf622b3 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
@@ -3517,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