---

yaml --- r: 224095 b: refs/heads/master c: a8760ec h: refs/heads/master i: 224093: 1b283e1 224091: 2624e94 224087: 54dc90b 224079: db0b23a 224063: 6b96c5a v: v3
git-mirror · Dec 13, 2010 · acc682e · acc682e
1 parent b65537a
commit acc682e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08ec0c58fb8a05d3191d5cb6f5d6f81adb419798
+refs/heads/master: a8760eca6cf60ed303ad494ef45901f63165d2c8
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
@@ -965,6 +965,9 @@ static void tsc_refine_calibration_work(struct work_struct *work)
 
 static int __init init_tsc_clocksource(void)
 {
+	if (!cpu_has_tsc || tsc_disabled > 0)
+		return 0;
+
 	if (tsc_clocksource_reliable)
 		clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY;
 	/* lower the rating if we already know its unstable: */