Merge branch 'misc-2.6.33' into release

2009-12-24 01:19:00 -05:00
parent 78a5331ddd 44ef00e648
commit fcb11235d3
12 changed files with 434 additions and 308 deletions
--- 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)