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

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b676a05a3734fe031178226a9da6a4257aee0a6b..c57316f230deb9dcd18c5c81cb3f31a0f83daf24 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1062,6 +1062,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        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
@@ -1958,9 +1963,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        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)