From acc682e74d3fea306070a57c0bcb886cac609174 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 13 Dec 2010 11:28:02 +0100
Subject: [PATCH] --- yaml --- r: 224095 b: refs/heads/master c:
 a8760eca6cf60ed303ad494ef45901f63165d2c8 h: refs/heads/master i:   224093:
 1b283e1039389a5dfa8663eadf44b2795c06b06c   224091:
 2624e944046c4f1e7d6db626cfae9ea03c00d477   224087:
 54dc90b32c211cfa1738906676e76b0eb97c1901   224079:
 db0b23afa547cb6f9c31b58bc661a328f647cca6   224063:
 6b96c5a8785131e0e6638a54c799c6aaef2a5052 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/tsc.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d368515c0630..c93a7e94c16d 100644
--- 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
index dc1393e7cbfb..356a0d455cf9 100644
--- 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: */