diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 19:34:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 19:34:47 +0200 |
| commit | 2ac6608c41f8c45371ea9dddae7f99bc2c15d5cf (patch) | |
| tree | 8d0c6801d488e5bfc6cc0bdf10bba35821bf5e69 /include/asm-alpha/smp.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa (diff) | |
| download | linux-2ac6608c41f8c45371ea9dddae7f99bc2c15d5cf.tar.xz linux-2ac6608c41f8c45371ea9dddae7f99bc2c15d5cf.zip | |
Revert broken "statement with no effect" warning fix
It may shut up gcc, but it also incorrectly changes the semantics of the
smp_call_function() helpers.
You can fix the warning other ways if you are interested (create another
inline function that takes no arguments and returns zero), but
preferably gcc just shouldn't complain about unused return values from
statement expressions in the first place.
Diffstat (limited to 'include/asm-alpha/smp.h')
| -rw-r--r-- | include/asm-alpha/smp.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h index a3d09d14fee2..9950706abdf8 100644 --- a/include/asm-alpha/smp.h +++ b/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 */ |