Please excuse the top posting, but weren't these issues resolved weeks ago?
Why switch back to a macro if there is no problem? David Daney ________________________________________ From: [email protected] [[email protected]] Sent: Wednesday, July 03, 2013 3:00 PM To: [email protected] Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected] Subject: [patch 001/445] include/linux/smp.h:on_each_cpu(): switch back to a macro From: Andrew Morton <[email protected]> Subject: include/linux/smp.h:on_each_cpu(): switch back to a macro f21afc25f9ed4 ("smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu()") converted on_each_cpu() to a C function. This required inclusion of irqflags.h, which broke ia64 and mn10300 (at least) due to header ordering hell. Switch on_each_cpu() back to a macro to fix this. Reported-by: Geert Uytterhoeven <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Cc: David Daney <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: <[email protected]> [3.10.x] Signed-off-by: Andrew Morton <[email protected]> --- include/linux/smp.h | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff -puN include/linux/smp.h~include-linux-smph-on_each_cpu-switch-back-to-a-macro include/linux/smp.h --- a/include/linux/smp.h~include-linux-smph-on_each_cpu-switch-back-to-a-macro +++ a/include/linux/smp.h @@ -11,7 +11,6 @@ #include <linux/list.h> #include <linux/cpumask.h> #include <linux/init.h> -#include <linux/irqflags.h> extern void cpu_idle(void); @@ -140,17 +139,14 @@ static inline int up_smp_call_function(s } #define smp_call_function(func, info, wait) \ (up_smp_call_function(func, info)) - -static inline int on_each_cpu(smp_call_func_t func, void *info, int wait) -{ - unsigned long flags; - - local_irq_save(flags); - func(info); - local_irq_restore(flags); - return 0; -} - +#define on_each_cpu(func, info, wait) \ + ({ \ + unsigned long __flags; \ + local_irq_save(__flags); \ + func(info); \ + local_irq_restore(__flags); \ + 0; \ + }) /* * Note we still need to test the mask even for UP * because we actually can get an empty mask from _ -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
