aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt12
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e07c432c731f..f22386321e7a 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>
@@ -638,7 +638,7 @@ and is between 256 and 4096 characters. It is defined in the file
638 638
639 elanfreq= [X86-32] 639 elanfreq= [X86-32]
640 See comment before function elanfreq_setup() in 640 See comment before function elanfreq_setup() in
641 arch/i386/kernel/cpu/cpufreq/elanfreq.c. 641 arch/x86/kernel/cpu/cpufreq/elanfreq.c.
642 642
643 elevator= [IOSCHED] 643 elevator= [IOSCHED]
644 Format: {"anticipatory" | "cfq" | "deadline" | "noop"} 644 Format: {"anticipatory" | "cfq" | "deadline" | "noop"}
@@ -1571,6 +1571,10 @@ and is between 256 and 4096 characters. It is defined in the file
1571 Format: { parport<nr> | timid | 0 } 1571 Format: { parport<nr> | timid | 0 }
1572 See also Documentation/parport.txt. 1572 See also Documentation/parport.txt.
1573 1573
1574 pmtmr= [X86] Manual setup of pmtmr I/O Port.
1575 Override pmtimer IOPort with a hex value.
1576 e.g. pmtmr=0x508
1577
1574 pnpacpi= [ACPI] 1578 pnpacpi= [ACPI]
1575 { off } 1579 { off }
1576 1580
@@ -1679,6 +1683,10 @@ and is between 256 and 4096 characters. It is defined in the file
1679 Format: <reboot_mode>[,<reboot_mode2>[,...]] 1683 Format: <reboot_mode>[,<reboot_mode2>[,...]]
1680 See arch/*/kernel/reboot.c or arch/*/kernel/process.c 1684 See arch/*/kernel/reboot.c or arch/*/kernel/process.c
1681 1685
1686 relax_domain_level=
1687 [KNL, SMP] Set scheduler's default relax_domain_level.
1688 See Documentation/cpusets.txt.
1689
1682 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area 1690 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area
1683 1691
1684 reservetop= [X86-32] 1692 reservetop= [X86-32]