Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 04:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

include/linux/smp.h:on_each_cpu(): switch back to a C function

Browse Source 
Revert commit c846ef7deb ("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>
This commit is contained in:
Andrew Morton 2013-09-11 14:19:37 -07:00 committed by Linus Torvalds
parent e831cbfc1a
commit 3b8967d713
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/linux/smp.h
View File

@ -11,6 +11,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irqflags.h>
extern void cpu_idle(void); extern void cpu_idle(void);
@ -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) \ #define smp_call_function(func, info, wait) \
(up_smp_call_function(func, info)) (up_smp_call_function(func, info))
#define on_each_cpu(func, info, wait) \
({ \ static inline int on_each_cpu(smp_call_func_t func, void *info, int wait)
unsigned long __flags; \ {
local_irq_save(__flags); \ unsigned long flags;
func(info); \
local_irq_restore(__flags); \ local_irq_save(flags);
0; \ func(info);
}) local_irq_restore(flags);
return 0;
}
/* /*
* Note we still need to test the mask even for UP * Note we still need to test the mask even for UP
* because we actually can get an empty mask from * because we actually can get an empty mask from