From: Peter Zijlstra <peterz@infradead.org>
Date: Mon, 25 Aug 2008 11:35:06 +0000 (+0200)
Subject: x86: fix cpufreq + sched_clock() regression
X-Git-Tag: v2.6.27-rc5~34^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=52a8968ce95da8469ba0a9b3e4010fe31caf77a3;p=linux-2.6-omap-h63xx.git

x86: fix cpufreq + sched_clock() regression

I noticed that my sched_clock() was slow on a number of machine, so I
started looking at cpufreq.

The below seems to fix the problem for me.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 9bed5cae4bd..8e786b0d665 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -314,7 +314,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 			mark_tsc_unstable("cpufreq changes");
 	}
 
-	set_cyc2ns_scale(tsc_khz_ref, freq->cpu);
+	set_cyc2ns_scale(tsc_khz, freq->cpu);
 
 	return 0;
 }