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/summit_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/summit_32.c')
-rw-r--r-- | arch/x86/kernel/summit_32.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c index 84ff9ebbcc97..ecb41b9d7aa0 100644 --- a/arch/x86/kernel/summit_32.c +++ b/arch/x86/kernel/summit_32.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <asm/genapic.h> | 43 | #include <asm/genapic.h> |
44 | #include <asm/fixmap.h> | 44 | #include <asm/fixmap.h> |
45 | #include <asm/apicdef.h> | 45 | #include <asm/apicdef.h> |
46 | #include <asm/ipi.h> | ||
46 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
47 | #include <linux/string.h> | 48 | #include <linux/string.h> |
48 | #include <linux/init.h> | 49 | #include <linux/init.h> |
@@ -54,12 +55,9 @@ static inline unsigned summit_get_apic_id(unsigned long x) | |||
54 | return (x >> 24) & 0xFF; | 55 | return (x >> 24) & 0xFF; |
55 | } | 56 | } |
56 | 57 | ||
57 | void default_send_IPI_mask_sequence(const cpumask_t *mask, int vector); | ||
58 | void default_send_IPI_mask_allbutself(const cpumask_t *mask, int vector); | ||
59 | |||
60 | static inline void summit_send_IPI_mask(const cpumask_t *mask, int vector) | 58 | static inline void summit_send_IPI_mask(const cpumask_t *mask, int vector) |
61 | { | 59 | { |
62 | default_send_IPI_mask_sequence(mask, vector); | 60 | default_send_IPI_mask_sequence_logical(mask, vector); |
63 | } | 61 | } |
64 | 62 | ||
65 | static inline void summit_send_IPI_allbutself(int vector) | 63 | static inline void summit_send_IPI_allbutself(int vector) |