aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-24 01:19:00 -0500
committerLen Brown <len.brown@intel.com>2009-12-24 01:19:00 -0500
commitfcb11235d3910c39afece52f6e106a9ca565d34b (patch)
tree07412f9c367f5f9bf6ad7ccd6fa8146c4aba68af /arch
parentMerge branch 'tc1100-wmi' into release (diff)
parenthp-wmi: Fix two memleaks (diff)
downloadlinux-dev-fcb11235d3910c39afece52f6e106a9ca565d34b.tar.xz
linux-dev-fcb11235d3910c39afece52f6e106a9ca565d34b.zip
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index f28decf8dde3..1b1920fa7c80 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -190,9 +190,11 @@ static void do_drv_write(void *_cmd)
static void drv_read(struct drv_cmd *cmd)
{
+ int err;
cmd->val = 0;
- smp_call_function_single(cpumask_any(cmd->mask), do_drv_read, cmd, 1);
+ err = smp_call_function_any(cmd->mask, do_drv_read, cmd, 1);
+ WARN_ON_ONCE(err); /* smp_call_function_any() was buggy? */
}
static void drv_write(struct drv_cmd *cmd)