diff options
| author | Linus Torvalds <[email protected]> | 2009-04-14 01:09:20 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-04-14 01:09:20 +0000 |
| commit | 1c98aa7424ff163637d8321674ec58dee28152d4 (patch) | |
| tree | 144f554a3ba928fefa8097eec982870d15f32c9c /fs/jbd2/commit.c | |
| parent | Merge branch 'for-rc1/xen/core' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | kernel-1c98aa7424ff163637d8321674ec58dee28152d4.tar.gz kernel-1c98aa7424ff163637d8321674ec58dee28152d4.zip | |
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
01599fca6758d2cd133e78f87426fc851c9ea725 ("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 18b2646fe3babeb40b34a0c1751e0bf5adfdc64c while fixing the resulting
rejects.
Switching it to `readin' looks correct."
Acked-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions