diff options
author | David Daney <david.daney@cavium.com> | 2013-09-11 17:23:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 18:58:25 -0400 |
commit | bff2dc42bcafdd75c0296987747f782965d691a0 (patch) | |
tree | 3e921a8fc93d7bff9a5ac1d5221be9f9938447e4 /include/linux/smp.h | |
parent | 081192b25c2d4620b5f5838620624d3daee94b66 (diff) |
smp.h: move !SMP version of on_each_cpu() out-of-line
All of the other non-trivial !SMP versions of functions in smp.h are
out-of-line in up.c. Move on_each_cpu() there as well.
This allows us to get rid of the #include <linux/irqflags.h>. The
drawback is that this makes both the x86_64 and i386 defconfig !SMP
kernels about 200 bytes larger each.
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/smp.h')
-rw-r--r-- | include/linux/smp.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h index 3724a9070907..cfb7ca094b38 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/list.h> | 11 | #include <linux/list.h> |
12 | #include <linux/cpumask.h> | 12 | #include <linux/cpumask.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/irqflags.h> | ||
15 | 14 | ||
16 | extern void cpu_idle(void); | 15 | extern void cpu_idle(void); |
17 | 16 | ||
@@ -30,6 +29,11 @@ int smp_call_function_single(int cpuid, smp_call_func_t func, void *info, | |||
30 | int wait); | 29 | int wait); |
31 | 30 | ||
32 | /* | 31 | /* |
32 | * Call a function on all processors | ||
33 | */ | ||
34 | int on_each_cpu(smp_call_func_t func, void *info, int wait); | ||
35 | |||
36 | /* | ||
33 | * Call a function on processors specified by mask, which might include | 37 | * Call a function on processors specified by mask, which might include |
34 | * the local one. | 38 | * the local one. |
35 | */ | 39 | */ |
@@ -112,11 +116,6 @@ static inline void call_function_init(void) { } | |||
112 | #endif | 116 | #endif |
113 | 117 | ||
114 | /* | 118 | /* |
115 | * Call a function on all processors | ||
116 | */ | ||
117 | int on_each_cpu(smp_call_func_t func, void *info, int wait); | ||
118 | |||
119 | /* | ||
120 | * Mark the boot cpu "online" so that it can call console drivers in | 119 | * Mark the boot cpu "online" so that it can call console drivers in |
121 | * printk() and can access its per-cpu storage. | 120 | * printk() and can access its per-cpu storage. |
122 | */ | 121 | */ |
@@ -141,16 +140,6 @@ static inline int up_smp_call_function(smp_call_func_t func, void *info) | |||
141 | #define smp_call_function(func, info, wait) \ | 140 | #define smp_call_function(func, info, wait) \ |
142 | (up_smp_call_function(func, info)) | 141 | (up_smp_call_function(func, info)) |
143 | 142 | ||
144 | static inline int on_each_cpu(smp_call_func_t func, void *info, int wait) | ||
145 | { | ||
146 | unsigned long flags; | ||
147 | |||
148 | local_irq_save(flags); | ||
149 | func(info); | ||
150 | local_irq_restore(flags); | ||
151 | return 0; | ||
152 | } | ||
153 | |||
154 | static inline void smp_send_reschedule(int cpu) { } | 143 | static inline void smp_send_reschedule(int cpu) { } |
155 | #define smp_prepare_boot_cpu() do {} while (0) | 144 | #define smp_prepare_boot_cpu() do {} while (0) |
156 | #define smp_call_function_many(mask, func, info, wait) \ | 145 | #define smp_call_function_many(mask, func, info, wait) \ |