Fix quilt merge error in acpi-cpufreq.c
We ended up incorrectly using '&cur' instead of '&readin' in the work_on_cpu() -> smp_call_function_single() transformation in commit01599fca67
("cpufreq: use smp_call_function_[single|many]() in acpi-cpufreq.c"). Andrew explains: "OK, the acpi tree went and had conflicting changes merged into it after I'd written the patch and it appears that I incorrectly reverted part of18b2646fe3
while fixing the resulting rejects. Switching it to `readin' looks correct." Acked-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
2e1c63b7ed
commit
1c98aa7424
|
@ -277,7 +277,7 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy,
|
||||||
unsigned int perf_percent;
|
unsigned int perf_percent;
|
||||||
unsigned int retval;
|
unsigned int retval;
|
||||||
|
|
||||||
if (smp_call_function_single(cpu, read_measured_perf_ctrs, &cur, 1))
|
if (smp_call_function_single(cpu, read_measured_perf_ctrs, &readin, 1))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
cur.aperf.whole = readin.aperf.whole -
|
cur.aperf.whole = readin.aperf.whole -
|
||||||
|
|
Reference in New Issue