diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /Documentation/kernel-parameters.txt | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b3a5aad7e629..312fe77764a4 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -571,6 +571,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 571 | 571 | ||
| 572 | debug_objects [KNL] Enable object debugging | 572 | debug_objects [KNL] Enable object debugging |
| 573 | 573 | ||
| 574 | debugpat [X86] Enable PAT debugging | ||
| 575 | |||
| 574 | decnet.addr= [HW,NET] | 576 | decnet.addr= [HW,NET] |
| 575 | Format: <area>[,<node>] | 577 | Format: <area>[,<node>] |
| 576 | See also Documentation/networking/decnet.txt. | 578 | See also Documentation/networking/decnet.txt. |
| @@ -756,9 +758,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 756 | hd= [EIDE] (E)IDE hard drive subsystem geometry | 758 | hd= [EIDE] (E)IDE hard drive subsystem geometry |
| 757 | Format: <cyl>,<head>,<sect> | 759 | Format: <cyl>,<head>,<sect> |
| 758 | 760 | ||
| 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 | 761 | 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 | 762 | size of <nn>. This works even on boxes that have no |
| 764 | highmem otherwise. This also works to reduce highmem | 763 | highmem otherwise. This also works to reduce highmem |
| @@ -1610,6 +1609,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1610 | Format: { parport<nr> | timid | 0 } | 1609 | Format: { parport<nr> | timid | 0 } |
| 1611 | See also Documentation/parport.txt. | 1610 | See also Documentation/parport.txt. |
| 1612 | 1611 | ||
| 1612 | pmtmr= [X86] Manual setup of pmtmr I/O Port. | ||
| 1613 | Override pmtimer IOPort with a hex value. | ||
| 1614 | e.g. pmtmr=0x508 | ||
| 1615 | |||
| 1613 | pnpacpi= [ACPI] | 1616 | pnpacpi= [ACPI] |
| 1614 | { off } | 1617 | { off } |
| 1615 | 1618 | ||