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 51649987f691dad9b339d3ac8d8770ac2d5ede08..8039daced6888e2f4f1169c88e38bd1ff4ef44f5 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -6,6 +6,8 @@
  *             Alan Cox. <alan@redhat.com>
  */
 
+#include <linux/errno.h>
+#include <asm/system.h>
 
 extern void cpu_idle(void);
 
@@ -83,7 +85,6 @@ void smp_prepare_boot_cpu(void);
  *     These macros fold the SMP functionality into a single CPU system
  */
 #define raw_smp_processor_id()                 0
-#define hard_smp_processor_id()                        0
 static inline int up_smp_call_function(void)
 {
        return 0;
@@ -99,6 +100,15 @@ static inline int up_smp_call_function(void)
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()                     1
 #define smp_prepare_boot_cpu()                 do {} while (0)
+static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
+                                          void *info, int retry, int wait)
+{
+       WARN_ON(cpuid != 0);
+       local_irq_disable();
+       func(info);
+       local_irq_enable();
+       return 0;
+}
 
 #endif /* !SMP */