vserver 1.9.5.x5

[linux-2.6.git] / Documentation / x86_64 / boot-options.txt

diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 7f8570a..44b6eea 100644 (file)
--- 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
 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.
 
 
    noapic       Don't use the IO-APIC.
 


@@ -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
 
    syntax: earlyprintk=vga
 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.
 
   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
 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
    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)
 
    triple Force a triple fault (init)
    kbd    Use the keyboard controller. cold reset (default)
 


@@ -83,26 +86,17 @@ Rebooting
    Disadvantage is that not all hardware will be completely reinitialized
    on reboot so there may be boot problems on some systems.
 
    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
 
 Non Executable Mappings
 
   noexec=on|off
 

-  on      Enable
+  on      Enable(default)

   off     Disable
   off     Disable

-  noforce (default) Don't enable by default for heap/stack/data,
-          but allow PROT_EXEC to be effective
-
-  noexec32=opt{,opt}
-
-  Control the no exec default for 32bit processes.
-  Requires noexec=on or noexec=noforce to be effective.
-
-  Valid options:
-     all,on    Heap,stack,data is non executable.
-     off       (default) Heap,stack,data is executable
-     stack     Stack is non executable, heap/data is.
-     force     Don't imply PROT_EXEC for PROT_READ
-     compat    (default) Imply PROT_EXEC for PROT_READ

 
 SMP
 
 
 SMP
 


@@ -116,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
 


@@ -124,6 +121,12 @@ ACPI
                interpreter
   acpi=force   Force ACPI on (currently not needed)
 
                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
 PCI
 
   pci=off      Don't use PCI


@@ -133,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=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
 
 
 IOMMU
 


@@ -158,3 +162,19 @@ IOMMU
 
   pages  Prereserve that many 128K pages for the software IO bounce buffering.
   force  Force all IO through the software TLB.
 
   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.
+