1 files changed, 36 insertions, 2 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4924d387a657..3d5cd7a09b2f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -37,7 +37,7 @@ restrictions referred to are that the relevant option is valid if:
         IA-32   IA-32 aka i386 architecture is enabled.
         IA-64   IA-64 architecture is enabled.
         IOSCHED More than one I/O scheduler is enabled.
-        IP_PNP  IP DCHP, BOOTP, or RARP is enabled.
+        IP_PNP  IP DHCP, BOOTP, or RARP is enabled.
         ISAPNP  ISA PnP code is enabled.
         ISDN    Appropriate ISDN support is enabled.
         JOY     Appropriate joystick support is enabled.
@@ -159,6 +159,11 @@ running once the system is up.
 
         acpi_fake_ecdt  [HW,ACPI] Workaround failure due to BIOS lacking ECDT
 
+        acpi_generic_hotkey [HW,ACPI]
+                        Allow consolidated generic hotkey driver to
+                        over-ride platform specific driver.
+                        See also Documentation/acpi-hotkey.txt.
+
         ad1816=         [HW,OSS]
                         Format: <io>,<irq>,<dma>,<dma2>
                         See also Documentation/sound/oss/AD1816.
@@ -358,6 +363,10 @@ running once the system is up.
         cpia_pp=        [HW,PPT]
                         Format: { parport<nr> | auto | none }
 
+        crashkernel=nn[KMG]@ss[KMG]
+                        [KNL] Reserve a chunk of physical memory to
+                        hold a kernel to switch to with kexec on panic.
+
         cs4232=         [HW,OSS]
                         Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
 
@@ -447,6 +456,10 @@ running once the system is up.
                         Format: {"as"|"cfq"|"deadline"|"noop"}
                         See Documentation/block/as-iosched.txt
                         and Documentation/block/deadline-iosched.txt for details.
+        elfcorehdr=     [IA-32]
+                        Specifies physical address of start of kernel core image
+                        elf header.
+                        See Documentation/kdump.txt for details.
 
         enforcing       [SELINUX] Set initial enforcing status.
                         Format: {"0" | "1"}
@@ -548,6 +561,9 @@ running once the system is up.
 
         i810=           [HW,DRM]
 
+        i8k.ignore_dmi  [HW] Continue probing hardware even if DMI data
+                        indicates that the driver is running on unsupported
+                        hardware.
         i8k.force       [HW] Activate i8k driver even if SMM BIOS signature
                         does not match list of supported models.
         i8k.power_status
@@ -611,6 +627,17 @@ running once the system is up.
         ips=            [HW,SCSI] Adaptec / IBM ServeRAID controller
                         See header of drivers/scsi/ips.c.
 
+        irqfixup        [HW]
+                        When an interrupt is not handled search all handlers
+                        for it. Intended to get systems with badly broken
+                        firmware running.
+
+        irqpoll         [HW]
+                        When an interrupt is not handled search all handlers
+                        for it. Also check all handlers each timer
+                        interrupt. Intended to get systems with badly broken
+                        firmware running.
+
         isapnp=         [ISAPNP]
                         Format: <RDP>, <reset>, <pci_scan>, <verbosity>
 
@@ -736,6 +763,9 @@ running once the system is up.
         maxcpus=        [SMP] Maximum number of processors that an SMP kernel
                         should make use of
 
+        max_addr=[KMG]  [KNL,BOOT,ia64] All physical memory greater than or
+                        equal to this physical address is ignored.
+
         max_luns=       [SCSI] Maximum number of LUNs to probe
                         Should be between 1 and 2^32-1.
 
@@ -1019,6 +1049,10 @@ running once the system is up.
                 irqmask=0xMMMM          [IA-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 this way.
+                pirqaddr=0xAAAAA        [IA-32] Specify the physical address
+                                        of the PIRQ table (normally generated
+                                        by the BIOS) if it is outside the
+                                        F0000h-100000h range.
                 lastbus=N               [IA-32] Scan all buses till bus #N. Can be useful
                                         if the kernel is unable to find your secondary buses
                                         and you want to tell it explicitly which ones they are.
@@ -1104,7 +1138,7 @@ running once the system is up.
                         See Documentation/ramdisk.txt.
 
         psmouse.proto=  [HW,MOUSE] Highest PS2 mouse protocol extension to
-                        probe for (bare|imps|exps).
+                        probe for (bare|imps|exps|lifebook|any).
         psmouse.rate=   [HW,MOUSE] Set desired mouse report rate, in reports
                         per second.
         psmouse.resetafter=