diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-11 18:08:53 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-11 18:08:53 -0800 |
commit | f95e6dae6522e0c403bef92405a3577ebd8baee9 (patch) | |
tree | 40c9f91e77cba0fddd1c019ae317f5768c267740 /Documentation | |
parent | f741676a0eea898c7fd2169df9cfcf65a3f76bd1 (diff) | |
parent | aae7d141676c5d83dbc97732f1cf48839f404774 (diff) | |
download | history-f95e6dae6522e0c403bef92405a3577ebd8baee9.tar.gz |
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.11
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/x86_64/boot-options.txt | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index d12607071491e8..44b6eea60ecec1 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt @@ -14,8 +14,6 @@ Machine check APICs 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. @@ -25,6 +23,8 @@ APICs pirq=... See Documentation/i386/IO-APIC.txt + noapictimer Don't set up the APIC timer + Early Console syntax: earlyprintk=vga @@ -61,6 +61,9 @@ Timing This is useful when you use a panic=... timeout and need the box quickly up again. + nohpet + Don't use the HPET timer. + Idle loop idle=poll @@ -74,7 +77,7 @@ Rebooting reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old] bios Use the CPU reboto vector for warm reset 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) kbd Use the keyboard controller. cold reset (default) @@ -83,6 +86,11 @@ Rebooting Disadvantage is that not all hardware will be completely reinitialized 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 noexec=on|off @@ -102,6 +110,9 @@ NUMA 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 @@ -110,6 +121,12 @@ ACPI interpreter 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=off Don't use PCI @@ -119,6 +136,7 @@ PCI pci=assign-busses Assign busses pci=irqmask=MASK Set PCI interrupt mask to MASK 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 @@ -144,3 +162,19 @@ IOMMU pages Prereserve that many 128K pages for the software IO bounce buffering. 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. + |