tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[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>

authored by

Richard Henderson and committed by
Linus Torvalds 79a88102 11be00cb

+23 -6
+7 -2
include/asm-alpha/smp.h
··· 50 50 extern int smp_num_cpus; 51 51 #define cpu_possible_map cpu_present_mask 52 52 53 - int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, int wait, cpumask_t cpu); 53 + int smp_call_function_on_cpu(void (*) (void *), void *, int, int, cpumask_t); 54 54 55 55 #else /* CONFIG_SMP */ 56 56 57 - #define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; }) 57 + static inline int 58 + smp_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 64 #endif /* CONFIG_SMP */ 60 65
+16 -4
include/linux/smp.h
··· 94 94 */ 95 95 #define raw_smp_processor_id() 0 96 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; }) 99 - static inline void smp_send_reschedule(int cpu) { } 100 97 #define num_booting_cpus() 1 101 - #define smp_prepare_boot_cpu() do {} while (0) 98 + 99 + static inline int smp_call_function(void (*func) (void *), void *info, 100 + int retry, int wait) 101 + { 102 + return 0; 103 + } 104 + 105 + static inline int on_each_cpu(void (*func) (void *), void *info, 106 + int retry, int wait) 107 + { 108 + func(info); 109 + return 0; 110 + } 111 + 112 + static inline void smp_send_reschedule(int cpu) { } 113 + static inline void smp_prepare_boot_cpu(void) { } 102 114 103 115 #endif /* !SMP */ 104 116