Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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 b9e6be0..f2cd6ef 100644 (file)
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -6,6 +6,18 @@ only the AMD64 specific ones are listed here.
 Machine check
 
    mce=off disable machine check
 Machine check
 
    mce=off disable machine check

+   mce=bootlog Enable logging of machine checks left over from booting.
+               Disabled by default on AMD because some BIOS leave bogus ones.
+               If your BIOS doesn't do that it's a good idea to enable though
+               to make sure you log even machine check events that result
+               in a reboot. On Intel systems it is enabled by default.
+   mce=nobootlog
+               Disable boot machine check logging.
+   mce=tolerancelevel (number)
+               0: always panic, 1: panic if deadlock possible,
+               2: try to avoid panic, 3: never panic or exit (for testing)
+               default is 1
+               Can be also set using sysfs which is preferable.

 
    nomce (for compatibility with i386): same as mce=off
 
 
    nomce (for compatibility with i386): same as mce=off
 


@@ -28,6 +40,22 @@ APICs
    no_timer_check Don't check the IO-APIC timer. This can work around
                 problems with incorrect timer initialization on some boards.
 
    no_timer_check Don't check the IO-APIC timer. This can work around
                 problems with incorrect timer initialization on some boards.
 

+   apicmaintimer Run time keeping from the local APIC timer instead
+                 of using the PIT/HPET interrupt for this. This is useful
+                 when the PIT/HPET interrupts are unreliable.
+
+   noapicmaintimer  Don't do time keeping using the APIC timer.
+                Useful when this option was auto selected, but doesn't work.
+
+   apicpmtimer
+                Do APIC timer calibration using the pmtimer. Implies
+                apicmaintimer. Useful when your PIT timer is totally
+                broken.
+
+   disable_8254_timer / enable_8254_timer
+                Enable interrupt 0 timer routing over the 8254 in addition to over
+                the IO-APIC. The kernel tries to set a sensible default.
+

 Early Console
 
    syntax: earlyprintk=vga
 Early Console
 
    syntax: earlyprintk=vga


@@ -47,7 +75,7 @@ Timing
   notsc
   Don't use the CPU time stamp counter to read the wall time.
   This can be used to work around timing problems on multiprocessor systems
   notsc
   Don't use the CPU time stamp counter to read the wall time.
   This can be used to work around timing problems on multiprocessor systems

-  with not properly synchronized CPUs. Only useful with a SMP kernel
+  with not properly synchronized CPUs.

 
   report_lost_ticks
   Report when timer interrupts are lost because some code turned off
 
   report_lost_ticks
   Report when timer interrupts are lost because some code turned off


@@ -74,6 +102,9 @@ Idle loop
   event. This will make the CPUs eat a lot more power, but may be useful
   to get slightly better performance in multiprocessor benchmarks. It also
   makes some profiling using performance counters more accurate.
   event. This will make the CPUs eat a lot more power, but may be useful
   to get slightly better performance in multiprocessor benchmarks. It also
   makes some profiling using performance counters more accurate.

+  Please note that on systems with MONITOR/MWAIT support (like Intel EM64T
+  CPUs) this option has no performance advantage over the normal idle loop.
+  It may also interact badly with hyperthreading.

 
 Rebooting
 
 
 Rebooting
 


@@ -109,6 +140,9 @@ SMP
 
   cpumask=MASK   only use cpus with bits set in mask
 
 
   cpumask=MASK   only use cpus with bits set in mask
 

+  additional_cpus=NUM Allow NUM more CPUs for hotplug
+                (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec)
+

 NUMA
 
   numa=off     Only set up a single NUMA node spanning all memory.
 NUMA
 
   numa=off     Only set up a single NUMA node spanning all memory.


@@ -117,6 +151,11 @@ NUMA
 
   numa=fake=X   Fake X nodes and ignore NUMA setup of the actual machine.
 
 
   numa=fake=X   Fake X nodes and ignore NUMA setup of the actual machine.
 

+  numa=hotadd=percent
+               Only allow hotadd memory to preallocate page structures upto
+               percent of already available memory.
+               numa=hotadd=0 will disable hotadd memory.
+

 ACPI
 
   acpi=off     Don't enable ACPI
 ACPI
 
   acpi=off     Don't enable ACPI


@@ -175,9 +214,11 @@ Debugging
 
   kstack=N   Print that many words from the kernel stack in oops dumps.
 
 
   kstack=N   Print that many words from the kernel stack in oops dumps.
 

-Misc
+  pagefaulttrace Dump all page faults. Only useful for extreme debugging
+               and will create a lot of output.

 
 

-  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.
+Misc

 
 

+  noreplacement  Don't replace instructions with more appropriate ones
+                for the CPU. This may be useful on asymmetric MP systems
+                where some CPU have less capabilities than the others.