]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: Change warning message in TSC calibration.
authorAlok N Kataria <akataria@vmware.com>
Thu, 4 Sep 2008 01:18:01 +0000 (18:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Sep 2008 03:10:37 +0000 (20:10 -0700)
When calibration against PIT fails, the warning that we print is misleading.
In a virtualized environment the VM may get descheduled while calibration
or, the check in PIT calibration may fail due to other virtualization
overheads.

The warning message explicitly assumes that calibration failed due to SMI's
which may not be the case. Change that to something proper.

Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/tsc.c

index 346cae5ac4237b5602d04910edd4a2f43fab36af..8f98e9de1b82f5f6a13015bd34fe428187e79c38 100644 (file)
@@ -267,8 +267,7 @@ unsigned long native_calibrate_tsc(void)
         */
        if (tsc_pit_min == ULONG_MAX) {
                /* PIT gave no useful value */
-               printk(KERN_WARNING "TSC: PIT calibration failed due to "
-                      "SMI disturbance.\n");
+               printk(KERN_WARNING "TSC: Unable to calibrate against PIT\n");
 
                /* We don't have an alternative source, disable TSC */
                if (!hpet && !pm1 && !pm2) {