From 35d98a55545cc315efeff16ecdb0b0e40d33d35a Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Aug 2008 11:52:06 -0700
Subject: [PATCH] --- yaml --- r: 109108 b: refs/heads/master c:
 060700b571717c997a2ea5e2049b848fa248ee13 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f0033eee59af..677efed31762 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8735728ef8dc935c4fb351f913758fdbb62c308d
+refs/heads/master: 060700b571717c997a2ea5e2049b848fa248ee13
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
index 46af71676738..9bed5cae4bdc 100644
--- a/trunk/arch/x86/kernel/tsc.c
+++ b/trunk/arch/x86/kernel/tsc.c
@@ -325,6 +325,10 @@ static struct notifier_block time_cpufreq_notifier_block = {
 
 static int __init cpufreq_tsc(void)
 {
+	if (!cpu_has_tsc)
+		return 0;
+	if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
+		return 0;
 	cpufreq_register_notifier(&time_cpufreq_notifier_block,
 				CPUFREQ_TRANSITION_NOTIFIER);
 	return 0;