---

yaml --- r: 109108 b: refs/heads/master c: 060700b h: refs/heads/master v: v3
git-mirror · Aug 25, 2008 · 35d98a5 · 35d98a5
1 parent f7e3f00
commit 35d98a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;