aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2008-08-25 13:35:06 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-25 14:39:19 +0200
commit52a8968ce95da8469ba0a9b3e4010fe31caf77a3 (patch)
tree6acffeb98a2f598be29e559a75dbfe5deb5864b3
parentMerge branch 'linus' into x86/urgent (diff)
downloadlinux-dev-52a8968ce95da8469ba0a9b3e4010fe31caf77a3.tar.xz
linux-dev-52a8968ce95da8469ba0a9b3e4010fe31caf77a3.zip
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>
-rw-r--r--arch/x86/kernel/tsc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 9bed5cae4bdc..8e786b0d665a 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;
}