Skip to content

Commit

Permalink
include/linux/smp.h:on_each_cpu(): switch back to a C function
Browse files Browse the repository at this point in the history
Revert commit c846ef7 ("include/linux/smp.h:on_each_cpu(): switch
back to a macro").  It turns out that the problematic linux/irqflags.h
include was fixed within ia64 and mn10300.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Daney <david.daney@cavium.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Sep 11, 2013
1 parent e831cbf commit 3b8967d
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions include/linux/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <linux/list.h>
#include <linux/cpumask.h>
#include <linux/init.h>
#include <linux/irqflags.h>

extern void cpu_idle(void);

Expand Down Expand Up @@ -139,14 +140,17 @@ static inline int up_smp_call_function(smp_call_func_t func, void *info)
}
#define smp_call_function(func, info, wait) \
(up_smp_call_function(func, info))
#define on_each_cpu(func, info, wait) \
({ \
unsigned long __flags; \
local_irq_save(__flags); \
func(info); \
local_irq_restore(__flags); \
0; \
})

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;
}

/*
* Note we still need to test the mask even for UP
* because we actually can get an empty mask from
Expand Down

0 comments on commit 3b8967d

Please sign in to comment.