1 files changed, 47 insertions, 8 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 12533a958c51..38d7db3262c7 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -64,6 +64,7 @@ parameter is applicable:
         GENERIC_TIME The generic timeofday code is enabled.
         NFS     Appropriate NFS support is enabled.
         OSS     OSS sound support is enabled.
+        PV_OPS  A paravirtualized kernel
         PARIDE  The ParIDE subsystem is enabled.
         PARISC  The PA-RISC architecture is enabled.
         PCI     PCI bus support is enabled.
@@ -181,19 +182,41 @@ and is between 256 and 4096 characters. It is defined in the file
                         that require a timer override, but don't have
                         HPET
 
-        acpi_dbg_layer= [HW,ACPI]
+        acpi.debug_layer=       [HW,ACPI]
                         Format: <int>
                         Each bit of the <int> indicates an ACPI debug layer,
                         1: enable, 0: disable. It is useful for boot time
                         debugging. After system has booted up, it can be set
-                        via /proc/acpi/debug_layer.
-
-        acpi_dbg_level= [HW,ACPI]
+                        via /sys/module/acpi/parameters/debug_layer.
+                        CONFIG_ACPI_DEBUG must be enabled for this to produce any output.
+                        Available bits (add the numbers together) to enable debug output
+                        for specific parts of the ACPI subsystem:
+                        0x01 utilities 0x02 hardware 0x04 events 0x08 tables
+                        0x10 namespace 0x20 parser 0x40 dispatcher
+                        0x80 executer 0x100 resources 0x200 acpica debugger
+                        0x400 os services 0x800 acpica disassembler.
+                        The number can be in decimal or prefixed with 0x in hex.
+                        Warning: Many of these options can produce a lot of
+                        output and make your system unusable. Be very careful.
+
+        acpi.debug_level=       [HW,ACPI]
                         Format: <int>
                         Each bit of the <int> indicates an ACPI debug level,
                         1: enable, 0: disable. It is useful for boot time
                         debugging. After system has booted up, it can be set
-                        via /proc/acpi/debug_level.
+                        via /sys/module/acpi/parameters/debug_level.
+                        CONFIG_ACPI_DEBUG must be enabled for this to produce any output.
+                        Available bits (add the numbers together) to enable different
+                        debug output levels of the ACPI subsystem:
+                        0x01 error 0x02 warn 0x04 init 0x08 debug object
+                        0x10 info 0x20 init names 0x40 parse 0x80 load
+                        0x100 dispatch 0x200 execute 0x400 names 0x800 operation region
+                        0x1000 bfield 0x2000 tables 0x4000 values 0x8000 objects
+                        0x10000 resources 0x20000 user requests 0x40000 package.
+                        The number can be in decimal or prefixed with 0x in hex.
+                        Warning: Many of these options can produce a lot of
+                        output and make your system unusable. Be very careful.
+
 
         acpi_fake_ecdt  [HW,ACPI] Workaround failure due to BIOS lacking ECDT
 
@@ -673,8 +696,15 @@ and is between 256 and 4096 characters. It is defined in the file
         idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
                         See Documentation/ide.txt.
 
-        idle=           [HW]
-                        Format: idle=poll or idle=halt
+        idle=           [X86]
+                        Format: idle=poll or idle=mwait
+                        Poll forces a polling idle loop that can slightly improves the performance
+                        of waking up a idle CPU, but will use a lot of power and make the system
+                        run hot. Not recommended.
+                        idle=mwait. On systems which support MONITOR/MWAIT but the kernel chose
+                        to not use it because it doesn't save as much power as a normal idle
+                        loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same
+                        as idle=poll.
 
         ignore_loglevel [KNL]
                         Ignore loglevel setting - this will print /all/
@@ -1135,6 +1165,11 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nomce           [IA-32] Machine Check Exception
 
+        noreplace-paravirt      [IA-32,PV_OPS] Don't patch paravirt_ops
+
+        noreplace-smp   [IA-32,SMP] Don't replace SMP instructions
+                        with UP alternatives
+
         noresidual      [PPC] Don't use residual data on PReP machines.
 
         noresume        [SWSUSP] Disables resume and restores original swap
@@ -1540,6 +1575,9 @@ and is between 256 and 4096 characters. It is defined in the file
         smart2=         [HW]
                         Format: <io1>[,<io2>[,...,<io8>]]
 
+        smp-alt-once    [IA-32,SMP] On a hotplug CPU system, only
+                        attempt to substitute SMP alternatives once at boot.
+
         snd-ad1816a=    [HW,ALSA]
 
         snd-ad1848=     [HW,ALSA]
@@ -1792,12 +1830,13 @@ and is between 256 and 4096 characters. It is defined in the file
                         for newly-detected USB devices (default 2).  This
                         is the time required before an idle device will be
                         autosuspended.  Devices for which the delay is set
-                        to 0 won't be autosuspended at all.
+                        to a negative value won't be autosuspended at all.
 
         usbhid.mousepoll=
                         [USBHID] The interval which mice are to be polled at.
 
         vdso=           [IA-32,SH]
+                        vdso=2: enable compat VDSO (default with COMPAT_VDSO)
                         vdso=1: enable VDSO (default)
                         vdso=0: disable VDSO mapping