diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-02 15:03:10 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-02 15:03:10 +0000 |
| commit | 6c046e405564608dd0889e0938656781550fd70c (patch) | |
| tree | 5a5bb29cec194493d30d40de8e1d21dd3fa106da /arch/arm/mach-omap2/omap-smp.c | |
| parent | 0d0ffa94e0ea0aab3dcb75366806d064f05fdc45 (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
| download | linux-6c046e405564608dd0889e0938656781550fd70c.tar.gz linux-6c046e405564608dd0889e0938656781550fd70c.tar.bz2 linux-6c046e405564608dd0889e0938656781550fd70c.zip | |
Merge branch 'irqchip/gic-vic-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into for-arm-soc/virt/mach
Diffstat (limited to 'arch/arm/mach-omap2/omap-smp.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index cd42d921940d..361677983af0 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -19,9 +19,9 @@ #include <linux/device.h> #include <linux/smp.h> #include <linux/io.h> +#include <linux/irqchip/arm-gic.h> #include <asm/cacheflush.h> -#include <asm/hardware/gic.h> #include <asm/smp_scu.h> #include "omap-secure.h" @@ -157,7 +157,7 @@ static int __cpuinit omap4_boot_secondary(unsigned int cpu, struct task_struct * booted = true; } - gic_raise_softirq(cpumask_of(cpu), 0); + arch_send_wakeup_ipi_mask(cpumask_of(cpu)); /* * Now the secondary core is starting up let it run its @@ -231,8 +231,6 @@ static void __init omap4_smp_init_cpus(void) for (i = 0; i < ncores; i++) set_cpu_possible(i, true); - - set_smp_cross_call(gic_raise_softirq); } static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) |