diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 07:48:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 07:48:17 -0400 |
| commit | f648972e017659c741bdd3be6b4aeb2d73672031 (patch) | |
| tree | a71e69aa8bd0259bdf4f5b0361c773eeae36b794 /arch/x86/kernel/tsc.c | |
| parent | 8c56250f48347750c82ab18d98d647dcf99ca674 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into core/locking
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 3 |
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) { |