From f1684cc6c927613e3386d56f862e4b8af3b2b8ea Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 11 Jan 2011 11:40:48 +0100 Subject: [PATCH] --- yaml --- r: 228974 b: refs/heads/master c: 29fe359ca20326e57b25e8545c49ed9ff5e830c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tsc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ccf466b73d0b..2a85d2f45cfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4aed89d6b515b9185351706ca95cd712c9d8d6a3 +refs/heads/master: 29fe359ca20326e57b25e8545c49ed9ff5e830c7 diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c index 356a0d455cf9..463901efdba4 100644 --- a/trunk/arch/x86/kernel/tsc.c +++ b/trunk/arch/x86/kernel/tsc.c @@ -965,7 +965,7 @@ static void tsc_refine_calibration_work(struct work_struct *work) static int __init init_tsc_clocksource(void) { - if (!cpu_has_tsc || tsc_disabled > 0) + if (!cpu_has_tsc || tsc_disabled > 0 || !tsc_khz) return 0; if (tsc_clocksource_reliable)