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

[linux-2.6-microblaze.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 4237963..49f2acc 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1197,9 +1197,10 @@
                        arch/x86/kernel/cpu/cpufreq/elanfreq.c.
 
        elevator=       [IOSCHED]
-                       Format: {"cfq" | "deadline" | "noop"}
-                       See Documentation/block/cfq-iosched.txt and
-                       Documentation/block/deadline-iosched.txt for details.
+                       Format: { "mq-deadline" | "kyber" | "bfq" }
+                       See Documentation/block/deadline-iosched.txt,
+                       Documentation/block/kyber-iosched.txt and
+                       Documentation/block/bfq-iosched.txt for details.
 
        elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]
                        Specifies physical address of start of kernel core
@@ -1996,6 +1997,12 @@
                        Built with CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y,
                        the default is off.
 
+       kpti=           [ARM64] Control page table isolation of user
+                       and kernel address spaces.
+                       Default: enabled on cores which need mitigation.
+                       0: force disabled
+                       1: force enabled
+
        kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.
                        Default is 0 (don't ignore, but inject #GP)