aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2005-07-28 04:07:41 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 11:39:02 -0400
commit79a8810221ee9ea96c4e5a5817afb88f22ea698c (patch)
tree7e2c09f335ac6e51e6bad2299c3f9da4132d34c9 /include
parent11be00cba6be114f861123cfc6779f195a615d22 (diff)
[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')
-rw-r--r--include/asm-alpha/smp.h9
-rw-r--r--include/linux/smp.h20
2 files changed, 23 insertions, 6 deletions
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h
index 9950706abdf8..a3d09d14fee2 100644
--- a/include/asm-alpha/smp.h
+++ b/include/asm-alpha/smp.h
@@ -50,11 +50,16 @@ extern cpumask_t cpu_online_map;
50extern int smp_num_cpus; 50extern int smp_num_cpus;
51#define cpu_possible_map cpu_present_mask 51#define cpu_possible_map cpu_present_mask
52 52
53int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, int wait, cpumask_t cpu); 53int smp_call_function_on_cpu(void (*) (void *), void *, int, int, cpumask_t);
54 54
55#else /* CONFIG_SMP */ 55#else /* CONFIG_SMP */
56 56
57#define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; }) 57static inline int
58smp_call_function_on_cpu (void (*func) (void *), void *info, int retry,
59 int wait, cpumask_t cpu)
60{
61 return 0;
62}
58 63
59#endif /* CONFIG_SMP */ 64#endif /* CONFIG_SMP */
60 65
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);
94 */ 94 */
95#define raw_smp_processor_id() 0 95#define raw_smp_processor_id() 0
96#define hard_smp_processor_id() 0 96#define hard_smp_processor_id() 0
97#define smp_call_function(func,info,retry,wait) ({ 0; })
98#define on_each_cpu(func,info,retry,wait) ({ func(info); 0; })
99static inline void smp_send_reschedule(int cpu) { }
100#define num_booting_cpus() 1 97#define num_booting_cpus() 1
101#define smp_prepare_boot_cpu() do {} while (0) 98
99static inline int smp_call_function(void (*func) (void *), void *info,
100 int retry, int wait)
101{
102 return 0;
103}
104
105static inline int on_each_cpu(void (*func) (void *), void *info,
106 int retry, int wait)
107{
108 func(info);
109 return 0;
110}
111
112static inline void smp_send_reschedule(int cpu) { }
113static inline void smp_prepare_boot_cpu(void) { }
102 114
103#endif /* !SMP */ 115#endif /* !SMP */
104 116