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

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index da0e0773ca96d8107b3b72bfbf59a390085beee0..9aa8ff3e54dc31554f1ea78e21958cb8aee60185 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1042,16 +1042,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Claim all unknown PCI IDE storage controllers.
 
        idle=           [X86]
-                       Format: idle=poll, idle=mwait, idle=halt, idle=nomwait
+                       Format: idle=poll, idle=halt, idle=nomwait
                        Poll forces a polling idle loop that can slightly
                        improve the performance of waking up a idle CPU, but
                        will use a lot of power and make the system run hot.
                        Not recommended.
-                       idle=mwait: On systems which support MONITOR/MWAIT but
-                       the kernel chose to not use it because it doesn't save
-                       as much power as a normal idle loop, use the
-                       MONITOR/MWAIT idle loop anyways. Performance should be
-                       the same as idle=poll.
                        idle=halt: Halt is forced to be used for CPU idle.
                        In such case C2/C3 won't be used again.
                        idle=nomwait: Disable mwait for CPU C-states
@@ -1134,6 +1129,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        0       disables intel_idle and fall back on acpi_idle.
                        1 to 6  specify maximum depth of C-state.
 
+       intel_pstate=  [X86]
+                      disable
+                        Do not enable intel_pstate as the default
+                        scaling driver for the supported processors
+
        intremap=       [X86-64, Intel-IOMMU]
                        on      enable Interrupt Remapping (default)
                        off     disable Interrupt Remapping
@@ -1889,10 +1889,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        wfi(ARM) instruction doesn't work correctly and not to
                        use it. This is also useful when using JTAG debugger.
 
-       no-hlt          [BUGS=X86-32] Tells the kernel that the hlt
-                       instruction doesn't work correctly and not to
-                       use it.
-
        no_file_caps    Tells the kernel not to honor file capabilities.  The
                        only way then for a file to be executed with privilege
                        is to be setuid root or executed by root.
@@ -2441,7 +2437,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        real-time workloads.  It can also improve energy
                        efficiency for asymmetric multiprocessors.
 
-       rcu_nocbs_poll  [KNL,BOOT]
+       rcu_nocb_poll   [KNL,BOOT]
                        Rather than requiring that offloaded CPUs
                        (specified by rcu_nocbs= above) explicitly
                        awaken the corresponding "rcuoN" kthreads,