aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/tsc.c
diff options
context:
space:
mode:
authorAlok N Kataria <akataria@vmware.com>2008-09-03 21:18:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-03 23:10:37 -0400
commitde014d617636d6a6bd5aef3b3d1f7f9a35669057 (patch)
tree0fb29f036345dfc46c4517c57456536cfa93c529 /arch/x86/kernel/tsc.c
parentce36394269ccd9d1d286d6192ba09fa6894365e9 (diff)
x86: Change warning message in TSC calibration.
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>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
-rw-r--r--arch/x86/kernel/tsc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 346cae5ac423..8f98e9de1b82 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -267,8 +267,7 @@ unsigned long native_calibrate_tsc(void)
267 */ 267 */
268 if (tsc_pit_min == ULONG_MAX) { 268 if (tsc_pit_min == ULONG_MAX) {
269 /* PIT gave no useful value */ 269 /* PIT gave no useful value */
270 printk(KERN_WARNING "TSC: PIT calibration failed due to " 270 printk(KERN_WARNING "TSC: Unable to calibrate against PIT\n");
271 "SMI disturbance.\n");
272 271
273 /* We don't have an alternative source, disable TSC */ 272 /* We don't have an alternative source, disable TSC */
274 if (!hpet && !pm1 && !pm2) { 273 if (!hpet && !pm1 && !pm2) {