]> git.baikalelectronics.ru Git - kernel.git/commit
Fix quilt merge error in acpi-cpufreq.c
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2009 01:09:20 +0000 (18:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2009 01:09:20 +0000 (18:09 -0700)
commitf4d193bc222454c7804ec9a1ff91917637b15a33
tree144f554a3ba928fefa8097eec982870d15f32c9c
parenta0ecf4f3d6b80f10e52e563217ab664ffaaa8a9e
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
0343fd94ab4809bbe5aebd5b440c3dedff403f2b ("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 568123db6f14737e582fe63f2e11bbc50046df76 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>
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c