X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fsmp.h;h=e2fa3ab4afc5e9125e0dd6a98e3929b3eeba20fa;hb=f3cab8a0b1a772dc8b055b7affa567a366627c9e;hp=22b451d1b93f4ab18502077bc791e7cb0d4e0a1f;hpb=79a8810221ee9ea96c4e5a5817afb88f22ea698c;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 22b451d1b93..e2fa3ab4afc 100644
--- 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.
@@ -53,23 +52,12 @@ extern void smp_cpus_done(unsigned int max_cpus);
 /*
  * Call a function on all other processors
  */
-extern int smp_call_function (void (*func) (void *info), void *info,
-			      int retry, int wait);
+int smp_call_function(void(*func)(void *info), void *info, int retry, int wait);
 
 /*
  * Call a function on all processors
  */
-static inline int on_each_cpu(void (*func) (void *info), void *info,
-			      int retry, int wait)
-{
-	int ret = 0;
-
-	preempt_disable();
-	ret = smp_call_function(func, info, retry, wait);
-	func(info);
-	preempt_enable();
-	return ret;
-}
+int on_each_cpu(void (*func) (void *info), void *info, int retry, int wait);
 
 #define MSG_ALL_BUT_SELF	0x8000	/* Assume <32768 CPU's */
 #define MSG_ALL			0x8001
@@ -94,23 +82,21 @@ 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)
+static inline int up_smp_call_function(void)
 {
 	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)	(up_smp_call_function())
+#define on_each_cpu(func,info,retry,wait)	\
+	({					\
+		local_irq_disable();		\
+		func(info);			\
+		local_irq_enable();		\
+		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 */