Merge git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

[deliverable/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d4762d7ebd14b3726c2eefa94da09ea200841470..8f441dab03963624c0f32eb8f030c2b3c9a38f9d 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -343,6 +343,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        no: ACPI OperationRegions are not marked as reserved,
                        no further checks are performed.
 
+       acpi_no_memhotplug [ACPI] Disable memory hotplug.  Useful for kdump
+                          kernels.
+
        add_efi_memmap  [EFI; X86] Include EFI memory map in
                        kernel's map of available physical RAM.
 
@@ -1059,7 +1062,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        debugfs files are removed at module unload time.
 
        gpt             [EFI] Forces disk with valid GPT signature but
-                       invalid Protective MBR to be treated as GPT.
+                       invalid Protective MBR to be treated as GPT. If the
+                       primary GPT is corrupted, it enables the backup/alternate
+                       GPT to be used instead.
 
        grcan.enable0=  [HW] Configuration of physical interface 0. Determines
                        the "Enable 0" bit of the configuration register.
@@ -1461,6 +1466,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Valid arguments: on, off
                        Default: on
 
+       kmemcheck=      [X86] Boot-time kmemcheck enable/disable/one-shot mode
+                       Valid arguments: 0, 1, 2
+                       kmemcheck=0 (disabled)
+                       kmemcheck=1 (enabled)
+                       kmemcheck=2 (one-shot mode)
+                       Default: 2 (one-shot mode)
+
        kstack=N        [X86] Print N words from the kernel stack
                        in oops dumps.
 
@@ -3112,7 +3124,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        controller if no parameter or 1 is given or disable
                        it if 0 is given (See Documentation/cgroups/memory.txt)
 
-       swiotlb=        [IA-64] Number of I/O TLB slabs
+       swiotlb=        [ARM,IA-64,PPC,MIPS,X86]
+                       Format: { <int> | force }
+                       <int> -- Number of I/O TLB slabs
+                       force -- force using of bounce buffers even if they
+                                wouldn't be automatically used by the kernel
 
        switches=       [HW,M68k]