Commit 4f41c94d authored by Karsten Wiese's avatar Karsten Wiese Committed by Ingo Molnar

x86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier()

In time_cpufreq_notifier() the cpu id to act upon is held in freq->cpu. Use it
instead of smp_processor_id() in the call to set_cyc2ns_scale().
This makes the preempt_*able() unnecessary and lets set_cyc2ns_scale() update
the intended cpu's cyc2ns.

Related mail/thread: http://lkml.org/lkml/2007/12/7/130Signed-off-by: default avatarKarsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5b13d863
...@@ -256,9 +256,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data) ...@@ -256,9 +256,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data)
ref_freq, freq->new); ref_freq, freq->new);
if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { if (!(freq->flags & CPUFREQ_CONST_LOOPS)) {
tsc_khz = cpu_khz; tsc_khz = cpu_khz;
preempt_disable(); set_cyc2ns_scale(cpu_khz, freq->cpu);
set_cyc2ns_scale(cpu_khz, smp_processor_id());
preempt_enable();
/* /*
* TSC based sched_clock turns * TSC based sched_clock turns
* to junk w/ cpufreq * to junk w/ cpufreq
......
...@@ -148,9 +148,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, ...@@ -148,9 +148,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
mark_tsc_unstable("cpufreq changes"); mark_tsc_unstable("cpufreq changes");
} }
preempt_disable(); set_cyc2ns_scale(tsc_khz_ref, freq->cpu);
set_cyc2ns_scale(tsc_khz_ref, smp_processor_id());
preempt_enable();
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment