diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-01-29 19:31:49 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 15:21:24 +0100 |
| commit | 43f39890db2959b10891cf7bbf3f53fffc8ce3bd (patch) | |
| tree | 15e3705c14bfaf10eeed3c3220f1ff298e288b8d /arch/x86/kernel/numaq_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/numaq_32.c')
| -rw-r--r-- | arch/x86/kernel/numaq_32.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c index 83bb05524f4..c143b329216 100644 --- a/arch/x86/kernel/numaq_32.c +++ b/arch/x86/kernel/numaq_32.c @@ -302,6 +302,7 @@ int __init get_memcfg_numaq(void) #include <asm/genapic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> +#include <asm/ipi.h> #include <linux/kernel.h> #include <linux/string.h> #include <linux/init.h> @@ -319,17 +320,14 @@ static inline unsigned int numaq_get_apic_id(unsigned long x) return (x >> 24) & 0x0F; } -void default_send_IPI_mask_sequence(const struct cpumask *mask, int vector); -void default_send_IPI_mask_allbutself(const struct cpumask *mask, int vector); - static inline void numaq_send_IPI_mask(const struct cpumask *mask, int vector) { - default_send_IPI_mask_sequence(mask, vector); + default_send_IPI_mask_sequence_logical(mask, vector); } static inline void numaq_send_IPI_allbutself(int vector) { - default_send_IPI_mask_allbutself(cpu_online_mask, vector); + default_send_IPI_mask_allbutself_logical(cpu_online_mask, vector); } static inline void numaq_send_IPI_all(int vector) |