Merge tag 'docs-4.10' of git://git.lwn.net/linux

[mirror_ubuntu-zesty-kernel.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 456248b2722056a4a1f144c0cf8b090106cb478a..62d68b2056de116c556d92a555244c14be1d2e2a 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -863,6 +863,11 @@
 
        dscc4.setup=    [NET]
 
+       dump_apple_properties   [X86]
+                       Dump name and content of EFI device properties on
+                       x86 Macs.  Useful for driver authors to determine
+                       what data is available or for reverse-engineering.
+
        dyndbg[="val"]          [KNL,DYNAMIC_DEBUG]
        module.dyndbg[="val"]
                        Enable debug messages at boot time.  See
@@ -875,12 +880,6 @@
        nopku           [X86] Disable Memory Protection Keys CPU feature found
                        in some Intel CPUs.
 
-       eagerfpu=       [X86]
-                       on      enable eager fpu restore
-                       off     disable eager fpu restore
-                       auto    selects the default scheme, which automatically
-                               enables eagerfpu restore for xsaveopt.
-
        module.async_probe [KNL]
                        Enable asynchronous probe on this module.
 
@@ -1759,9 +1758,6 @@
                        kmemcheck=2 (one-shot mode)
                        Default: 2 (one-shot mode)
 
-       kstack=N        [X86] Print N words from the kernel stack
-                       in oops dumps.
-
        kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.
                        Default is 0 (don't ignore, but inject #GP)
 
@@ -2202,7 +2198,7 @@
                        that the amount of memory usable for all allocations
                        is not too small.
 
-       movable_node    [KNL,X86] Boot-time switch to enable the effects
+       movable_node    [KNL] Boot-time switch to enable the effects
                        of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details.
 
        MTD_Partition=  [MTD]
@@ -2555,6 +2551,10 @@
        no-kvmapf       [X86,KVM] Disable paravirtualized asynchronous page
                        fault handling.
 
+       no-vmw-sched-clock
+                       [X86,PV_OPS] Disable paravirtualized VMware scheduler
+                       clock and use the default one.
+
        no-steal-acc    [X86,KVM] Disable paravirtualized steal time accounting.
                        steal time is computed, but won't influence scheduler
                        behaviour
@@ -3631,12 +3631,6 @@
        shapers=        [NET]
                        Maximal number of shapers.
 
-       show_msr=       [x86] show boot-time MSR settings
-                       Format: { <integer> }
-                       Show boot-time (BIOS-initialized) MSR settings.
-                       The parameter means the number of CPUs to show,
-                       for example 1 means boot CPU only.
-
        simeth=         [IA-64]
        simscsi=