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 44fde25..c722ec1 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1883,11 +1883,6 @@
                        Note that using this option lowers the security
                        provided by tboot because it makes the system
                        vulnerable to DMA attacks.
-               nobounce [Default off]
-                       Disable bounce buffer for untrusted devices such as
-                       the Thunderbolt devices. This will treat the untrusted
-                       devices as the trusted ones, hence might expose security
-                       risks of DMA attacks.
 
        intel_idle.max_cstate=  [KNL,HW,ACPI,X86]
                        0       disables intel_idle and fall back on acpi_idle.
@@ -2259,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
@@ -2709,7 +2714,7 @@
                        option description.
 
        memmap=nn[KMG]@ss[KMG]
-                       [KNL] Force usage of a specific region of memory.
+                       [KNL, X86, MIPS, XTENSA] Force usage of a specific region of memory.
                        Region of memory to be used is from ss to ss+nn.
                        If @ss[KMG] is omitted, it is equivalent to mem=nn[KMG],
                        which limits max address to nn[KMG].
@@ -2953,7 +2958,7 @@
        mtdset=         [ARM]
                        ARM/S3C2412 JIVE boot control
 
-                       See arch/arm/mach-s3c2412/mach-jive.c
+                       See arch/arm/mach-s3c/mach-jive.c
 
        mtouchusb.raw_coordinates=
                        [HW] Make the MicroTouch USB driver use raw coordinates
@@ -3375,6 +3380,8 @@
 
        nosep           [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support.
 
+       nosgx           [X86-64,SGX] Disables Intel SGX kernel support.
+
        nosmp           [SMP] Tells an SMP kernel to act as a UP kernel,
                        and disable the IO APIC.  legacy for "maxcpus=0".
 
@@ -5663,6 +5670,7 @@
                                        device);
                                j = NO_REPORT_LUNS (don't use report luns
                                        command, uas only);
+                               k = NO_SAME (do not use WRITE_SAME, uas only)
                                l = NOT_LOCKABLE (don't try to lock and
                                        unlock ejectable media, not on uas);
                                m = MAX_SECTORS_64 (don't transfer more