Commit 709d96e9 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Updates for x86-64 boot-options.txt

Updates for x86-64 boot-options.txt
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8fd591d7
...@@ -14,8 +14,6 @@ Machine check ...@@ -14,8 +14,6 @@ Machine check
APICs APICs
apic Use IO-APIC. Default apic Use IO-APIC. Default
Unless you have an NVidia or VIA/Uniprocessor board.
Then it defaults to off.
noapic Don't use the IO-APIC. noapic Don't use the IO-APIC.
...@@ -25,6 +23,8 @@ APICs ...@@ -25,6 +23,8 @@ APICs
pirq=... See Documentation/i386/IO-APIC.txt pirq=... See Documentation/i386/IO-APIC.txt
noapictimer Don't set up the APIC timer
Early Console Early Console
syntax: earlyprintk=vga syntax: earlyprintk=vga
...@@ -61,6 +61,9 @@ Timing ...@@ -61,6 +61,9 @@ Timing
This is useful when you use a panic=... timeout and need the box This is useful when you use a panic=... timeout and need the box
quickly up again. quickly up again.
nohpet
Don't use the HPET timer.
Idle loop Idle loop
idle=poll idle=poll
...@@ -74,7 +77,7 @@ Rebooting ...@@ -74,7 +77,7 @@ Rebooting
reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old] reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old]
bios Use the CPU reboto vector for warm reset bios Use the CPU reboto vector for warm reset
warm Don't set the cold reboot flag warm Don't set the cold reboot flag
cold Set the cold reboto flag cold Set the cold reboot flag
triple Force a triple fault (init) triple Force a triple fault (init)
kbd Use the keyboard controller. cold reset (default) kbd Use the keyboard controller. cold reset (default)
...@@ -83,6 +86,11 @@ Rebooting ...@@ -83,6 +86,11 @@ Rebooting
Disadvantage is that not all hardware will be completely reinitialized Disadvantage is that not all hardware will be completely reinitialized
on reboot so there may be boot problems on some systems. on reboot so there may be boot problems on some systems.
reboot=force
Don't stop other CPUs on reboot. This can make reboot more reliable
in some cases.
Non Executable Mappings Non Executable Mappings
noexec=on|off noexec=on|off
...@@ -102,6 +110,9 @@ NUMA ...@@ -102,6 +110,9 @@ NUMA
numa=off Only set up a single NUMA node spanning all memory. numa=off Only set up a single NUMA node spanning all memory.
numa=noacpi Don't parse the SRAT table for NUMA setup
numa=fake=X Fake X nodes and ignore NUMA setup of the actual machine.
ACPI ACPI
...@@ -110,6 +121,12 @@ ACPI ...@@ -110,6 +121,12 @@ ACPI
interpreter interpreter
acpi=force Force ACPI on (currently not needed) acpi=force Force ACPI on (currently not needed)
acpi=strict Disable out of spec ACPI workarounds.
acpi_sci={edge,level,high,low} Set up ACPI SCI interrupt.
acpi=noirq Don't route interrupts
PCI PCI
pci=off Don't use PCI pci=off Don't use PCI
...@@ -119,6 +136,7 @@ PCI ...@@ -119,6 +136,7 @@ PCI
pci=assign-busses Assign busses pci=assign-busses Assign busses
pci=irqmask=MASK Set PCI interrupt mask to MASK pci=irqmask=MASK Set PCI interrupt mask to MASK
pci=lastbus=NUMBER Scan upto NUMBER busses, no matter what the mptable says. pci=lastbus=NUMBER Scan upto NUMBER busses, no matter what the mptable says.
pci=noacpi Don't use ACPI to set up PCI interrupt routing.
IOMMU IOMMU
...@@ -144,3 +162,19 @@ IOMMU ...@@ -144,3 +162,19 @@ IOMMU
pages Prereserve that many 128K pages for the software IO bounce buffering. pages Prereserve that many 128K pages for the software IO bounce buffering.
force Force all IO through the software TLB. force Force all IO through the software TLB.
Debugging
oops=panic Always panic on oopses. Default is to just kill the process,
but there is a small probability of deadlocking the machine.
This will also cause panics on machine check exceptions.
Useful together with panic=30 to trigger a reboot.
kstack=N Print that many words from the kernel stack in oops dumps.
Misc
noreplacement Don't replace instructions with more appropiate ones
for the CPU. This may be useful on asymmetric MP systems
where some CPU have less capabilities than the others.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment