Merge branch 'akpm-current/current'

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index af0b689a01635c7767aa92fd98a725c8b340acdb..62cc3d333c3c04b71889c0fa965214ddf8abbe19 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1050,7 +1050,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.
@@ -1452,6 +1454,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Valid arguments: on, off
                        Default: on
 
+       kmemcheck=      [KNL] 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.