diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
| commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 (patch) | |
| tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 /Documentation/kernel-parameters.txt | |
| parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 28 |
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 | |||
| 147 | default: 0 | 147 | default: 0 |
| 148 | 148 | ||
| 149 | acpi_sleep= [HW,ACPI] Sleep options | 149 | acpi_sleep= [HW,ACPI] Sleep options |
| 150 | Format: { s3_bios, s3_mode, s3_beep } | 150 | Format: { s3_bios, s3_mode, s3_beep, old_ordering } |
| 151 | See Documentation/power/video.txt for s3_bios and s3_mode. | 151 | See Documentation/power/video.txt for s3_bios and s3_mode. |
| 152 | s3_beep is for debugging; it makes the PC's speaker beep | 152 | s3_beep is for debugging; it makes the PC's speaker beep |
| 153 | as soon as the kernel's real-mode entry point is called. | 153 | as soon as the kernel's real-mode entry point is called. |
| 154 | old_ordering causes the ACPI 1.0 ordering of the _PTS | ||
| 155 | control method, wrt putting devices into low power | ||
| 156 | states, to be enforced (the ACPI 2.0 ordering of _PTS is | ||
| 157 | used by default). | ||
| 154 | 158 | ||
| 155 | acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode | 159 | acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode |
| 156 | Format: { level | edge | high | low } | 160 | Format: { level | edge | high | low } |
| @@ -571,6 +575,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 571 | 575 | ||
| 572 | debug_objects [KNL] Enable object debugging | 576 | debug_objects [KNL] Enable object debugging |
| 573 | 577 | ||
| 578 | debugpat [X86] Enable PAT debugging | ||
| 579 | |||
| 574 | decnet.addr= [HW,NET] | 580 | decnet.addr= [HW,NET] |
| 575 | Format: <area>[,<node>] | 581 | Format: <area>[,<node>] |
| 576 | See also Documentation/networking/decnet.txt. | 582 | See also Documentation/networking/decnet.txt. |
| @@ -756,9 +762,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 756 | hd= [EIDE] (E)IDE hard drive subsystem geometry | 762 | hd= [EIDE] (E)IDE hard drive subsystem geometry |
| 757 | Format: <cyl>,<head>,<sect> | 763 | Format: <cyl>,<head>,<sect> |
| 758 | 764 | ||
| 759 | hd?= [HW] (E)IDE subsystem | ||
| 760 | hd?lun= See Documentation/ide/ide.txt. | ||
| 761 | |||
| 762 | highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact | 765 | highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact |
| 763 | size of <nn>. This works even on boxes that have no | 766 | size of <nn>. This works even on boxes that have no |
| 764 | highmem otherwise. This also works to reduce highmem | 767 | 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 | |||
| 819 | See Documentation/ide/ide.txt. | 822 | See Documentation/ide/ide.txt. |
| 820 | 823 | ||
| 821 | idle= [X86] | 824 | idle= [X86] |
| 822 | Format: idle=poll or idle=mwait | 825 | Format: idle=poll or idle=mwait, idle=halt, idle=nomwait |
| 823 | Poll forces a polling idle loop that can slightly improves the performance | 826 | Poll forces a polling idle loop that can slightly improves the performance |
| 824 | of waking up a idle CPU, but will use a lot of power and make the system | 827 | of waking up a idle CPU, but will use a lot of power and make the system |
| 825 | run hot. Not recommended. | 828 | run hot. Not recommended. |
| @@ -827,6 +830,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 827 | to not use it because it doesn't save as much power as a normal idle | 830 | to not use it because it doesn't save as much power as a normal idle |
| 828 | loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same | 831 | loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same |
| 829 | as idle=poll. | 832 | as idle=poll. |
| 833 | idle=halt. Halt is forced to be used for CPU idle. | ||
| 834 | In such case C2/C3 won't be used again. | ||
| 835 | idle=nomwait. Disable mwait for CPU C-states | ||
| 830 | 836 | ||
| 831 | ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem | 837 | ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem |
| 832 | Claim all unknown PCI IDE storage controllers. | 838 | Claim all unknown PCI IDE storage controllers. |
| @@ -1242,6 +1248,11 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1242 | mtdparts= [MTD] | 1248 | mtdparts= [MTD] |
| 1243 | See drivers/mtd/cmdlinepart.c. | 1249 | See drivers/mtd/cmdlinepart.c. |
| 1244 | 1250 | ||
| 1251 | mtdset= [ARM] | ||
| 1252 | ARM/S3C2412 JIVE boot control | ||
| 1253 | |||
| 1254 | See arch/arm/mach-s3c2412/mach-jive.c | ||
| 1255 | |||
| 1245 | mtouchusb.raw_coordinates= | 1256 | mtouchusb.raw_coordinates= |
| 1246 | [HW] Make the MicroTouch USB driver use raw coordinates | 1257 | [HW] Make the MicroTouch USB driver use raw coordinates |
| 1247 | ('y', default) or cooked coordinates ('n') | 1258 | ('y', default) or cooked coordinates ('n') |
| @@ -1537,6 +1548,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1537 | Use with caution as certain devices share | 1548 | Use with caution as certain devices share |
| 1538 | address decoders between ROMs and other | 1549 | address decoders between ROMs and other |
| 1539 | resources. | 1550 | resources. |
| 1551 | norom [X86-32,X86_64] Do not assign address space to | ||
| 1552 | expansion ROMs that do not already have | ||
| 1553 | BIOS assigned address ranges. | ||
| 1540 | irqmask=0xMMMM [X86-32] Set a bit mask of IRQs allowed to be | 1554 | irqmask=0xMMMM [X86-32] Set a bit mask of IRQs allowed to be |
| 1541 | assigned automatically to PCI devices. You can | 1555 | assigned automatically to PCI devices. You can |
| 1542 | make the kernel exclude IRQs of your ISA cards | 1556 | 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 | |||
| 1612 | Format: { parport<nr> | timid | 0 } | 1626 | Format: { parport<nr> | timid | 0 } |
| 1613 | See also Documentation/parport.txt. | 1627 | See also Documentation/parport.txt. |
| 1614 | 1628 | ||
| 1629 | pmtmr= [X86] Manual setup of pmtmr I/O Port. | ||
| 1630 | Override pmtimer IOPort with a hex value. | ||
| 1631 | e.g. pmtmr=0x508 | ||
| 1632 | |||
| 1615 | pnpacpi= [ACPI] | 1633 | pnpacpi= [ACPI] |
| 1616 | { off } | 1634 | { off } |
| 1617 | 1635 | ||