Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

[linux-2.6-omap-h63xx.git] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 96ac21f8dd735ae2db06d9f16048bec4c8e40a23..8039daced6888e2f4f1169c88e38bd1ff4ef44f5 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -7,6 +7,7 @@
  */
 
 #include <linux/errno.h>
+#include <asm/system.h>
 
 extern void cpu_idle(void);
 
@@ -102,7 +103,11 @@ static inline void smp_send_reschedule(int cpu) { }
 static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
                                           void *info, int retry, int wait)
 {
-       return -EBUSY;
+       WARN_ON(cpuid != 0);
+       local_irq_disable();
+       func(info);
+       local_irq_enable();
+       return 0;
 }
 
 #endif /* !SMP */