From 8707bcd79c8785d7ee06be2a2bf2c11a661e1394 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 28 Jul 2005 10:34:47 -0700
Subject: [PATCH] --- yaml --- r: 5365 b: refs/heads/master c:
 2ac6608c41f8c45371ea9dddae7f99bc2c15d5cf h: refs/heads/master i:   5363:
 0144710fc03d730da11b45994a0abbdb0d401fde v: v3

---
 [refs]                        |  2 +-
 trunk/include/asm-alpha/smp.h |  9 ++-------
 trunk/include/linux/smp.h     | 20 ++++----------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index cc460df9e2e4..71f2b3dcf9be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b70888a192eff457c2ca0a4ffa04815f5e19734
+refs/heads/master: 2ac6608c41f8c45371ea9dddae7f99bc2c15d5cf
diff --git a/trunk/include/asm-alpha/smp.h b/trunk/include/asm-alpha/smp.h
index a3d09d14fee2..9950706abdf8 100644
--- a/trunk/include/asm-alpha/smp.h
+++ b/trunk/include/asm-alpha/smp.h
@@ -50,16 +50,11 @@ extern cpumask_t cpu_online_map;
 extern int smp_num_cpus;
 #define cpu_possible_map	cpu_present_mask
 
-int smp_call_function_on_cpu(void (*) (void *), void *, int, int, cpumask_t);
+int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, int wait, cpumask_t cpu);
 
 #else /* CONFIG_SMP */
 
-static inline int
-smp_call_function_on_cpu (void (*func) (void *), void *info, int retry,
-			  int wait, cpumask_t cpu)
-{
-	return 0;
-}
+#define smp_call_function_on_cpu(func,info,retry,wait,cpu)    ({ 0; })
 
 #endif /* CONFIG_SMP */
 
diff --git a/trunk/include/linux/smp.h b/trunk/include/linux/smp.h
index 22b451d1b93f..9dfa3ee769ae 100644
--- a/trunk/include/linux/smp.h
+++ b/trunk/include/linux/smp.h
@@ -94,23 +94,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 */