summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2005-07-28 12:07:41 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 19:39:02 +0400
commit79a8810221ee9ea96c4e5a5817afb88f22ea698c (patch)
tree7e2c09f335ac6e51e6bad2299c3f9da4132d34c9 /include/linux
parent11be00cba6be114f861123cfc6779f195a615d22 (diff)
downloadlinux-79a8810221ee9ea96c4e5a5817afb88f22ea698c.tar.xz
[PATCH] alpha: fix "statement with no effect" warnings
Apparently gcc 4.0 complains about "({ 0; });", which leads to -Werror breakage in one of the alpha oprofile modules. One might could argue that this is a gcc bug, in that statement-expressions should be considered to be function-like rather than statement-like for the purposes of this warning. But it's just as easy to use an inline function in the first place, side-stepping the issue. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/smp.h20
1 files changed, 16 insertions, 4 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 9dfa3ee769ae..22b451d1b93f 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -94,11 +94,23 @@ void smp_prepare_boot_cpu(void);
*/
#define raw_smp_processor_id() 0
#define hard_smp_processor_id() 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) { }
#define num_booting_cpus() 1
-#define smp_prepare_boot_cpu() do {} while (0)
+
+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;
+}
+
+static inline void smp_send_reschedule(int cpu) { }
+static inline void smp_prepare_boot_cpu(void) { }
#endif /* !SMP */