aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-08 04:32:56 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 04:32:56 -0400
commit896395c290f902576270d84291c1f7f8bfbe339d (patch)
tree650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /Documentation/kernel-parameters.txt
parentaf1cf204ba2fd8135933a2e4df523fb1112dc0e2 (diff)
parent1b40a895df6c7d5a80e71f65674060b03d84bbef (diff)
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 2000977af776..e53ff0975573 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -295,7 +295,7 @@ and is between 256 and 4096 characters. It is defined in the file
295 when initialising the APIC and IO-APIC components. 295 when initialising the APIC and IO-APIC components.
296 296
297 apm= [APM] Advanced Power Management 297 apm= [APM] Advanced Power Management
298 See header of arch/i386/kernel/apm.c. 298 See header of arch/x86/kernel/apm_32.c.
299 299
300 arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards 300 arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards
301 Format: <io>,<irq>,<nodeID> 301 Format: <io>,<irq>,<nodeID>
@@ -661,7 +661,7 @@ and is between 256 and 4096 characters. It is defined in the file
661 661
662 elanfreq= [X86-32] 662 elanfreq= [X86-32]
663 See comment before function elanfreq_setup() in 663 See comment before function elanfreq_setup() in
664 arch/i386/kernel/cpu/cpufreq/elanfreq.c. 664 arch/x86/kernel/cpu/cpufreq/elanfreq.c.
665 665
666 elevator= [IOSCHED] 666 elevator= [IOSCHED]
667 Format: {"anticipatory" | "cfq" | "deadline" | "noop"} 667 Format: {"anticipatory" | "cfq" | "deadline" | "noop"}
@@ -1702,6 +1702,10 @@ and is between 256 and 4096 characters. It is defined in the file
1702 Format: <reboot_mode>[,<reboot_mode2>[,...]] 1702 Format: <reboot_mode>[,<reboot_mode2>[,...]]
1703 See arch/*/kernel/reboot.c or arch/*/kernel/process.c 1703 See arch/*/kernel/reboot.c or arch/*/kernel/process.c
1704 1704
1705 relax_domain_level=
1706 [KNL, SMP] Set scheduler's default relax_domain_level.
1707 See Documentation/cpusets.txt.
1708
1705 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area 1709 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area
1706 1710
1707 reservetop= [X86-32] 1711 reservetop= [X86-32]