Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d9239d5f3ad38ee2aca01e1c6cf25f4c1a6c82a5..f20c7abc0329ca520d524a5c135a5597a8484086 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -116,6 +116,7 @@ parameter is applicable:
                        More X86-64 boot options can be found in
                        Documentation/x86/x86_64/boot-options.txt .
        X86     Either 32bit or 64bit x86 (same as X86-32+X86-64)
+       XEN     Xen support is enabled
 
 In addition, the following text indicates that the option:
 
@@ -1144,9 +1145,12 @@ and is between 256 and 4096 characters. It is defined in the file
        kgdboc=         [KGDB,HW] kgdb over consoles.
                        Requires a tty driver that supports console polling,
                        or a supported polling keyboard driver (non-usb).
-                       Serial only format: <serial_device>[,baud]
-                       keyboard only format: kbd
-                       keyboard and serial format: kbd,<serial_device>[,baud]
+                        Serial only format: <serial_device>[,baud]
+                        keyboard only format: kbd
+                        keyboard and serial format: kbd,<serial_device>[,baud]
+                       Optional Kernel mode setting:
+                        kms, kbd format: kms,kbd
+                        kms, kbd and serial format: kms,kbd,<ser_dev>[,baud]
 
        kgdbwait        [KGDB] Stop kernel execution and enter the
                        kernel debugger at the earliest opportunity.
@@ -1812,6 +1816,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nousb           [USB] Disable the USB subsystem
 
+       nowatchdog      [KNL] Disable the lockup detector.
+
        nowb            [ARM]
 
        nox2apic        [X86-64,APIC] Do not enable x2APIC mode.
@@ -2886,6 +2892,16 @@ and is between 256 and 4096 characters. It is defined in the file
        xd=             [HW,XT] Original XT pre-IDE (RLL encoded) disks.
        xd_geo=         See header of drivers/block/xd.c.
 
+       xen_emul_unplug=                [HW,X86,XEN]
+                       Unplug Xen emulated devices
+                       Format: [unplug0,][unplug1]
+                       ide-disks -- unplug primary master IDE devices
+                       aux-ide-disks -- unplug non-primary-master IDE devices
+                       nics -- unplug network devices
+                       all -- unplug all emulated devices (NICs and IDE disks)
+                       ignore -- continue loading the Xen platform PCI driver even
+                               if the version check failed
+
        xirc2ps_cs=     [NET,PCMCIA]
                        Format:
                        <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]