diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-11 18:05:29 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-11 18:05:29 +0100 |
commit | 4f5c1c04f8623387ce4af942b2bf547d3bba40ae (patch) | |
tree | feb06499fb920d0fe0eaa6673e5cd630b3b7775f /arch/arm/mach-spear13xx/platsmp.c | |
parent | Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h (diff) | |
download | linux-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.tar.xz linux-4f5c1c04f8623387ce4af942b2bf547d3bba40ae.zip |
Merge branch 'irqchip/gic-vic-move' into next/virt
Diffstat (limited to 'arch/arm/mach-spear13xx/platsmp.c')
-rw-r--r-- | arch/arm/mach-spear13xx/platsmp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-spear13xx/platsmp.c b/arch/arm/mach-spear13xx/platsmp.c index 2eaa3fa7b432..af4ade61cd95 100644 --- a/arch/arm/mach-spear13xx/platsmp.c +++ b/arch/arm/mach-spear13xx/platsmp.c @@ -15,8 +15,8 @@ #include <linux/jiffies.h> #include <linux/io.h> #include <linux/smp.h> +#include <linux/irqchip/arm-gic.h> #include <asm/cacheflush.h> -#include <asm/hardware/gic.h> #include <asm/smp_scu.h> #include <mach/spear.h> #include <mach/generic.h> @@ -104,8 +104,6 @@ static void __init spear13xx_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 spear13xx_smp_prepare_cpus(unsigned int max_cpus) |