aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/platsmp.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-04-03 08:01:30 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 11:53:17 -0400
commit0f7b332f9777819a39a3b325690379a7efef89d1 (patch)
treeabc9dc45eb604cc4af88a5ab8c4a6c0cbdaa0596 /arch/arm/mach-ux500/platsmp.c
parent43b3e1898206a1e385c9cb06f6040ea83a58b638 (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-ux500/platsmp.c')
-rw-r--r--arch/arm/mach-ux500/platsmp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 4fff4d408417..4e338466839e 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -18,6 +18,7 @@
18#include <linux/io.h> 18#include <linux/io.h>
19 19
20#include <asm/cacheflush.h> 20#include <asm/cacheflush.h>
21#include <asm/hardware/gic.h>
21#include <asm/smp_scu.h> 22#include <asm/smp_scu.h>
22#include <mach/hardware.h> 23#include <mach/hardware.h>
23#include <mach/setup.h> 24#include <mach/setup.h>
@@ -94,7 +95,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
94 */ 95 */
95 write_pen_release(cpu); 96 write_pen_release(cpu);
96 97
97 smp_cross_call(cpumask_of(cpu), 1); 98 gic_raise_softirq(cpumask_of(cpu), 1);
98 99
99 timeout = jiffies + (1 * HZ); 100 timeout = jiffies + (1 * HZ);
100 while (time_before(jiffies, timeout)) { 101 while (time_before(jiffies, timeout)) {
@@ -162,6 +163,8 @@ void __init smp_init_cpus(void)
162 163
163 for (i = 0; i < ncores; i++) 164 for (i = 0; i < ncores; i++)
164 set_cpu_possible(i, true); 165 set_cpu_possible(i, true);
166
167 set_smp_cross_call(gic_raise_softirq);
165} 168}
166 169
167void __init platform_smp_prepare_cpus(unsigned int max_cpus) 170void __init platform_smp_prepare_cpus(unsigned int max_cpus)