---

yaml --- r: 228974 b: refs/heads/master c: 29fe359 h: refs/heads/master v: v3
git-mirror · Jan 11, 2011 · f1684cc · f1684cc
1 parent d7e4103
commit f1684cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)