2 files changed, 9 insertions, 5 deletions

diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/i386/kernel/cpu/mcheck/therm_throt.c
index 7ba7c3abd3a4..1203dc5ab87a 100644
--- a/arch/i386/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/i386/kernel/cpu/mcheck/therm_throt.c
@@ -134,19 +134,21 @@ static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,
         int err;
 
         sys_dev = get_cpu_sysdev(cpu);
-        mutex_lock(&therm_cpu_lock);
         switch (action) {
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
+                mutex_lock(&therm_cpu_lock);
                 err = thermal_throttle_add_dev(sys_dev);
+                mutex_unlock(&therm_cpu_lock);
                 WARN_ON(err);
                 break;
         case CPU_DEAD:
         case CPU_DEAD_FROZEN:
+                mutex_lock(&therm_cpu_lock);
                 thermal_throttle_remove_dev(sys_dev);
+                mutex_unlock(&therm_cpu_lock);
                 break;
         }
-        mutex_unlock(&therm_cpu_lock);
         return NOTIFY_OK;
 }
 
diff --git a/arch/i386/kernel/smpcommon.c b/arch/i386/kernel/smpcommon.c
index 1868ae18eb4d..bbfe85a0f699 100644
--- a/arch/i386/kernel/smpcommon.c
+++ b/arch/i386/kernel/smpcommon.c
@@ -47,7 +47,7 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
 EXPORT_SYMBOL(smp_call_function);
 
 /**
- * smp_call_function_single - Run a function on another CPU
+ * smp_call_function_single - Run a function on a specific CPU
  * @cpu: The target CPU.  Cannot be the calling CPU.
  * @func: The function to run. This must be fast and non-blocking.
  * @info: An arbitrary pointer to pass to the function.
@@ -66,9 +66,11 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
         int ret;
         int me = get_cpu();
         if (cpu == me) {
-                WARN_ON(1);
+                local_irq_disable();
+                func(info);
+                local_irq_enable();
                 put_cpu();
-                return -EBUSY;
+                return 0;
         }
 
         ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait);