Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c98aa74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 commit
01599fca ("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
  of 18b2646f while fixing the resulting
  rejects.

  Switching it to `readin' looks correct."

Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2e1c63b7

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static unsigned int get_measured_perf(struct cpufreq_policy *policy, 
	unsigned int perf_percent;

	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;



	cur.aperf.whole = readin.aperf.whole -