tree 8d0c6801d488e5bfc6cc0bdf10bba35821bf5e69
parent 7b70888a192eff457c2ca0a4ffa04815f5e19734
author Linus Torvalds <[EMAIL PROTECTED]> Fri, 29 Jul 2005 00:34:47 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Fri, 29 Jul 2005 00:34:47 -0700
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.
include/asm-alpha/smp.h | 9 ++-------
include/linux/smp.h | 20 ++++----------------
2 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h
--- 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 */
diff --git a/include/linux/smp.h b/include/linux/smp.h
--- a/include/linux/smp.h
+++ b/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 */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
