diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-03 08:01:30 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 11:53:17 -0400 |
commit | 0f7b332f9777819a39a3b325690379a7efef89d1 (patch) | |
tree | abc9dc45eb604cc4af88a5ab8c4a6c0cbdaa0596 /arch/arm/mach-vexpress | |
parent | 43b3e1898206a1e385c9cb06f6040ea83a58b638 (diff) |
ARM: consolidate SMP cross call implementation
Rather than having each platform class provide a mach/smp.h header for
smp_cross_call(), arrange for them to register the function with the
core ARM SMP code instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-vexpress')
-rw-r--r-- | arch/arm/mach-vexpress/ct-ca9x4.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/include/mach/smp.h | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index ebc22e759325..9dc1c697fd2a 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c | |||
@@ -210,6 +210,8 @@ static void ct_ca9x4_init_cpu_map(void) | |||
210 | 210 | ||
211 | for (i = 0; i < ncores; ++i) | 211 | for (i = 0; i < ncores; ++i) |
212 | set_cpu_possible(i, true); | 212 | set_cpu_possible(i, true); |
213 | |||
214 | set_smp_cross_call(gic_raise_softirq); | ||
213 | } | 215 | } |
214 | 216 | ||
215 | static void ct_ca9x4_smp_enable(unsigned int max_cpus) | 217 | static void ct_ca9x4_smp_enable(unsigned int max_cpus) |
diff --git a/arch/arm/mach-vexpress/include/mach/smp.h b/arch/arm/mach-vexpress/include/mach/smp.h deleted file mode 100644 index 4c05e4a9713a..000000000000 --- a/arch/arm/mach-vexpress/include/mach/smp.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #ifndef __MACH_SMP_H | ||
2 | #define __MACH_SMP_H | ||
3 | |||
4 | #include <asm/hardware/gic.h> | ||
5 | |||
6 | /* | ||
7 | * We use IRQ1 as the IPI | ||
8 | */ | ||
9 | static inline void smp_cross_call(const struct cpumask *mask, int ipi) | ||
10 | { | ||
11 | gic_raise_softirq(mask, ipi); | ||
12 | } | ||
13 | #endif | ||