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

[karo-tx-linux.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index ef77c55e87e2f560361e012c865d3a2361001f1e..f2e745844d5bac2820772a254eff8d46a0853ef2 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -549,15 +549,6 @@
                        loops can be debugged more effectively on production
                        systems.
 
-       clocksource.arm_arch_timer.fsl-a008585=
-                       [ARM64]
-                       Format: <bool>
-                       Enable/disable the workaround of Freescale/NXP
-                       erratum A-008585.  This can be useful for KVM
-                       guests, if the guest device tree doesn't show the
-                       erratum.  If unspecified, the workaround is
-                       enabled based on the device tree.
-
        clearcpuid=BITNUM [X86]
                        Disable CPUID feature X for the kernel. See
                        arch/x86/include/asm/cpufeatures.h for the valid bit
@@ -3281,6 +3272,13 @@
                        Lazy RCU callbacks are those which RCU can
                        prove do nothing more than free memory.
 
+       rcutree.rcu_kick_kthreads= [KNL]
+                       Cause the grace-period kthread to get an extra
+                       wake_up() if it sleeps three times longer than
+                       it should at force-quiescent-state time.
+                       This wake_up() will be accompanied by a
+                       WARN_ONCE() splat and an ftrace_dump().
+
        rcuperf.gp_exp= [KNL]
                        Measure performance of expedited synchronous
                        grace-period primitives.
@@ -3566,6 +3564,10 @@
        rhash_entries=  [KNL,NET]
                        Set number of hash buckets for route cache
 
+       ring3mwait=disable
+                       [KNL] Disable ring 3 MONITOR/MWAIT feature on supported
+                       CPUs.
+
        ro              [KNL] Mount root device read-only on boot
 
        rodata=         [KNL]