Merge branch 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Check tsc available/disabled in the delayed init function
  x86: Improve TSC calibration using a delayed workqueue
  x86: Make tsc=reliable override boot time stability checks

diff --combined Documentation/kernel-parameters.txt
index d6496fd,c7c8eca..f3dc951
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1579,12 -1579,20 +1579,12 @@@ and is between 256 and 4096 characters
  
        nmi_watchdog=   [KNL,BUGS=X86] Debugging features for SMP kernels
                        Format: [panic,][num]
 -                      Valid num: 0,1,2
 +                      Valid num: 0
                        0 - turn nmi_watchdog off
 -                      1 - use the IO-APIC timer for the NMI watchdog
 -                      2 - use the local APIC for the NMI watchdog using
 -                      a performance counter. Note: This will use one
 -                      performance counter and the local APIC's performance
 -                      vector.
                        When panic is specified, panic when an NMI watchdog
                        timeout occurs.
                        This is useful when you use a panic=... timeout and
                        need the box quickly up again.
 -                      Instead of 1 and 2 it is possible to use the following
 -                      symbolic names: lapic and ioapic
 -                      Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
  
        netpoll.carrier_timeout=
                        [NET] Specifies amount of time (in seconds) that
@@@ -1614,8 -1622,6 +1614,8 @@@
        noapic          [SMP,APIC] Tells the kernel to not make use of any
                        IOAPICs that may be present in the system.
  
 +      noautogroup     Disable scheduler automatic task group creation.
 +
        nobats          [PPC] Do not use BATs for mapping kernel lowmem
                        on "Classic" PPC cores.
  
@@@ -1753,7 -1759,7 +1753,7 @@@
  
        nousb           [USB] Disable the USB subsystem
  
 -      nowatchdog      [KNL] Disable the lockup detector.
 +      nowatchdog      [KNL] Disable the lockup detector (NMI watchdog).
  
        nowb            [ARM]
  
@@@ -2169,6 -2175,11 +2169,6 @@@
        reset_devices   [KNL] Force drivers to reset the underlying device
                        during initialization.
  
 -      resource_alloc_from_bottom
 -                      Allocate new resources from the beginning of available
 -                      space, not the end.  If you need to use this, please
 -                      report a bug.
 -
        resume=         [SWSUSP]
                        Specify the partition device for software suspend
  
@@@ -2374,11 -2385,6 +2374,11 @@@
                        improve throughput, but will also increase the
                        amount of memory reserved for use by the client.
  
 +      swapaccount[=0|1]
 +                      [KNL] Enable accounting of swap in memory resource
 +                      controller if no parameter or 1 is given or disable
 +                      it if 0 is given (See Documentation/cgroups/memory.txt)
 +
        swiotlb=        [IA-64] Number of I/O TLB slabs
  
        switches=       [HW,M68k]
@@@ -2461,12 -2467,13 +2461,13 @@@
                        to facilitate early boot debugging.
                        See also Documentation/trace/events.txt
  
-       tsc=            Disable clocksource-must-verify flag for TSC.
+       tsc=            Disable clocksource stability checks for TSC.
                        Format: <string>
                        [x86] reliable: mark tsc clocksource as reliable, this
-                       disables clocksource verification at runtime.
-                       Used to enable high-resolution timer mode on older
-                       hardware, and in virtualized environment.
+                       disables clocksource verification at runtime, as well
+                       as the stability checks done at bootup. Used to enable
+                       high-resolution timer mode on older hardware, and in
+                       virtualized environment.
                        [x86] noirqtime: Do not use TSC to do irq accounting.
                        Used to run time disable IRQ_TIME_ACCOUNTING on any
                        platforms where RDTSC is slow and this accounting