[PATCH] x86_64: Allow to run main time keeping from the local APIC interrupt

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

diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index ffe1c062088b9daa52954b2dd6054975f52b9a7b..654ea4fccff880f0e42a95d0aa3c06ffd60ee1ac 100644 (file)
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -7,10 +7,12 @@ Machine check
 
    mce=off disable machine check
    mce=bootlog Enable logging of machine checks left over from booting.
 
    mce=off disable machine check
    mce=bootlog Enable logging of machine checks left over from booting.

-               Disabled by default because some BIOS leave bogus ones.
+               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
                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.
+               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)
    mce=tolerancelevel (number)
                0: always panic, 1: panic if deadlock possible,
                2: try to avoid panic, 3: never panic or exit (for testing)


@@ -38,6 +40,13 @@ 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.
+

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


@@ -122,6 +131,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.


@@ -188,8 +200,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.
 

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

 Misc
 
 Misc
 

-  noreplacement  Don't replace instructions with more appropiate ones
+  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.
                 for the CPU. This may be useful on asymmetric MP systems
                 where some CPU have less capabilities than the others.