diff options
author | Yinghai Lu <yinghai@kernel.org> | 2009-01-29 22:31:49 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 09:21:24 -0500 |
commit | 43f39890db2959b10891cf7bbf3f53fffc8ce3bd (patch) | |
tree | 15e3705c14bfaf10eeed3c3220f1ff298e288b8d /arch/x86/kernel/bigsmp_32.c | |
parent | 1ff2f20de354a621ef4b56b9cfe6f9139a7e493b (diff) |
x86: seperate default_send_IPI_mask_sequence/allbutself from logical
Impact: 32-bit should use logical version
there are two version: for default_send_IPI_mask_sequence/allbutself
one in ipi.h and one in ipi.c for 32bit
it seems .h version overwrote ipi.c for a while.
restore it so 32 bit could use its old logical version.
also remove dupicated functions in .c
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/bigsmp_32.c')
-rw-r--r-- | arch/x86/kernel/bigsmp_32.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/bigsmp_32.c b/arch/x86/kernel/bigsmp_32.c index b1f91931003f..ab645c93a6e7 100644 --- a/arch/x86/kernel/bigsmp_32.c +++ b/arch/x86/kernel/bigsmp_32.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <asm/genapic.h> | 9 | #include <asm/genapic.h> |
10 | #include <asm/fixmap.h> | 10 | #include <asm/fixmap.h> |
11 | #include <asm/apicdef.h> | 11 | #include <asm/apicdef.h> |
12 | #include <asm/ipi.h> | ||
12 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
13 | #include <linux/init.h> | 14 | #include <linux/init.h> |
14 | #include <linux/dmi.h> | 15 | #include <linux/dmi.h> |
@@ -154,17 +155,14 @@ static inline int bigsmp_phys_pkg_id(int cpuid_apic, int index_msb) | |||
154 | return cpuid_apic >> index_msb; | 155 | return cpuid_apic >> index_msb; |
155 | } | 156 | } |
156 | 157 | ||
157 | void default_send_IPI_mask_sequence(const struct cpumask *mask, int vector); | ||
158 | void default_send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
159 | |||
160 | static inline void bigsmp_send_IPI_mask(const struct cpumask *mask, int vector) | 158 | static inline void bigsmp_send_IPI_mask(const struct cpumask *mask, int vector) |
161 | { | 159 | { |
162 | default_send_IPI_mask_sequence(mask, vector); | 160 | default_send_IPI_mask_sequence_phys(mask, vector); |
163 | } | 161 | } |
164 | 162 | ||
165 | static inline void bigsmp_send_IPI_allbutself(int vector) | 163 | static inline void bigsmp_send_IPI_allbutself(int vector) |
166 | { | 164 | { |
167 | default_send_IPI_mask_allbutself(cpu_online_mask, vector); | 165 | default_send_IPI_mask_allbutself_phys(cpu_online_mask, vector); |
168 | } | 166 | } |
169 | 167 | ||
170 | static inline void bigsmp_send_IPI_all(int vector) | 168 | static inline void bigsmp_send_IPI_all(int vector) |