summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-17 23:29:46 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 23:39:19 +0200
commit8dfd588c3180b7403c402b4545164ee4543f8f86 (patch)
tree9bd261e2b78f20ea852f60ee1a13f57cff51cdae
parentmixart: Add missing vmalloc.h include (diff)
downloadlinux-8dfd588c3180b7403c402b4545164ee4543f8f86.tar.xz
linux-8dfd588c3180b7403c402b4545164ee4543f8f86.zip
smp_call_function_single() should be a macro on UP
... or we end up with header include order problems from hell. E.g. on m68k this is 100% fatal - local_irq_enable() there wants preempt_count(), which wants task_struct fields, which we won't have when we are in smp.h pulled from sched.h. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/smp.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 8039daced688..259a13c3bd98 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -7,7 +7,6 @@
*/
#include <linux/errno.h>
-#include <asm/system.h>
extern void cpu_idle(void);
@@ -100,15 +99,14 @@ 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;
-}
+#define smp_call_function_single(cpuid, func, info, retry, wait) \
+({ \
+ WARN_ON(cpuid != 0); \
+ local_irq_disable(); \
+ (func)(info); \
+ local_irq_enable(); \
+ 0; \
+})
#endif /* !SMP */