1 files changed, 23 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index df262b3c3d6e..f5662b7a34d1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -147,10 +147,14 @@ and is between 256 and 4096 characters. It is defined in the file
                        default: 0
        acpi_sleep=     [HW,ACPI] Sleep options
-                        Format: { s3_bios, s3_mode, s3_beep }
+                        Format: { s3_bios, s3_mode, s3_beep, old_ordering }
                        See Documentation/power/video.txt for s3_bios and s3_mode.
                        s3_beep is for debugging; it makes the PC's speaker beep
                        as soon as the kernel's real-mode entry point is called.
+                        old_ordering causes the ACPI 1.0 ordering of the _PTS
+                        control method, wrt putting devices into low power
+                        states, to be enforced (the ACPI 2.0 ordering of _PTS is
+                        used by default).
        acpi_sci=       [HW,ACPI] ACPI System Control Interrupt trigger mode
                        Format: { level | edge | high | low }
@@ -571,6 +575,8 @@ and is between 256 and 4096 characters. It is defined in the file
        debug_objects   [KNL] Enable object debugging
+        debugpat        [X86] Enable PAT debugging
        decnet.addr=    [HW,NET]
                        Format: <area>[,<node>]
                        See also Documentation/networking/decnet.txt.
@@ -756,9 +762,6 @@ and is between 256 and 4096 characters. It is defined in the file
        hd=             [EIDE] (E)IDE hard drive subsystem geometry
                        Format: <cyl>,<head>,<sect>
-        hd?=            [HW] (E)IDE subsystem
-        hd?lun=         See Documentation/ide/ide.txt.
        highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
                        size of <nn>. This works even on boxes that have no
                        highmem otherwise. This also works to reduce highmem
@@ -819,7 +822,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        See Documentation/ide/ide.txt.
        idle=           [X86]
-                        Format: idle=poll or idle=mwait
+                        Format: idle=poll or idle=mwait, idle=halt, idle=nomwait
                        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.
@@ -827,6 +830,9 @@ and is between 256 and 4096 characters. It is defined in the file
                        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.
+                        idle=halt. Halt is forced to be used for CPU idle.
+                        In such case C2/C3 won't be used again.
+                        idle=nomwait. Disable mwait for CPU C-states
        ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
                        Claim all unknown PCI IDE storage controllers.
@@ -1242,6 +1248,11 @@ and is between 256 and 4096 characters. It is defined in the file
        mtdparts=       [MTD]
                        See drivers/mtd/cmdlinepart.c.
+        mtdset=         [ARM]
+                        ARM/S3C2412 JIVE boot control
+                        See arch/arm/mach-s3c2412/mach-jive.c
        mtouchusb.raw_coordinates=
                        [HW] Make the MicroTouch USB driver use raw coordinates
                        ('y', default) or cooked coordinates ('n')
@@ -1537,6 +1548,9 @@ and is between 256 and 4096 characters. It is defined in the file
                                Use with caution as certain devices share
                                address decoders between ROMs and other
                                resources.
+                norom           [X86-32,X86_64] Do not assign address space to
+                                expansion ROMs that do not already have
+                                BIOS assigned address ranges.
                irqmask=0xMMMM  [X86-32] Set a bit mask of IRQs allowed to be
                                assigned automatically to PCI devices. You can
                                make the kernel exclude IRQs of your ISA cards
@@ -1612,6 +1626,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: { parport<nr> | timid | 0 }
                        See also Documentation/parport.txt.
+        pmtmr=          [X86] Manual setup of pmtmr I/O Port. 
+                        Override pmtimer IOPort with a hex value.
+                        e.g. pmtmr=0x508
        pnpacpi=        [ACPI]
                        { off }