Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 22b451d1b93f4ab18502077bc791e7cb0d4e0a1f..44153fdf73fc0787072b21c043713f0fb62815a5 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -17,7 +17,6 @@ extern void cpu_idle(void);
 #include <linux/compiler.h>
 #include <linux/thread_info.h>
 #include <asm/smp.h>
-#include <asm/bug.h>
 
 /*
  * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc.
@@ -94,23 +93,11 @@ void smp_prepare_boot_cpu(void);
  */
 #define raw_smp_processor_id()                 0
 #define hard_smp_processor_id()                        0
-#define num_booting_cpus()                     1
-
-static inline int smp_call_function(void (*func) (void *), void *info,
-                                   int retry, int wait)
-{
-       return 0;
-}
-
-static inline int on_each_cpu(void (*func) (void *), void *info,
-                             int retry, int wait)
-{
-       func(info);
-       return 0;
-}
-
+#define smp_call_function(func,info,retry,wait)        ({ 0; })
+#define on_each_cpu(func,info,retry,wait)      ({ func(info); 0; })
 static inline void smp_send_reschedule(int cpu) { }
-static inline void smp_prepare_boot_cpu(void) { }
+#define num_booting_cpus()                     1
+#define smp_prepare_boot_cpu()                 do {} while (0)
 
 #endif /* !SMP */