Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[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 d243361..c722ec1 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2254,6 +2254,16 @@
                        for all guests.
                        Default is 1 (enabled) if in 64-bit or 32-bit PAE mode.
 
+       kvm-arm.mode=
+                       [KVM,ARM] Select one of KVM/arm64's modes of operation.
+
+                       protected: nVHE-based mode with support for guests whose
+                                  state is kept private from the host.
+                                  Not valid if the kernel is running in EL2.
+
+                       Defaults to VHE/nVHE based on hardware support and
+                       the value of CONFIG_ARM64_VHE.
+
        kvm-arm.vgic_v3_group0_trap=
                        [KVM,ARM] Trap guest accesses to GICv3 group-0
                        system registers