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.

1 files changed, 4 insertions, 16 deletions

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 22b451d1b93f..9dfa3ee769ae 100644
--- 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 */