diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2013-05-09 19:19:20 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-10 14:44:19 +0100 |
| commit | 9e01573b5cf8b3188c1f33493d2e73a30e8d25fc (patch) | |
| tree | 8674a76484a125b9f244eca3497df3ff69b963c2 | |
| parent | db90f91f6f4a870583d5c11cda187f20e4d835ae (diff) | |
| download | blackbird-op-linux-9e01573b5cf8b3188c1f33493d2e73a30e8d25fc.tar.gz blackbird-op-linux-9e01573b5cf8b3188c1f33493d2e73a30e8d25fc.zip | |
ARM: 7715/1: MCPM: adapt to GIC changes after upstream merge
Since commit c0114709ed85 ("irqchip: gic: Perform the gic_secondary_init()
call via CPU notifier") it is no longer required nor possible to call
gic_secondary_init() from platform code.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/common/mcpm_platsmp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/common/mcpm_platsmp.c b/arch/arm/common/mcpm_platsmp.c index 52b88d81b7bb..3caed0db6986 100644 --- a/arch/arm/common/mcpm_platsmp.c +++ b/arch/arm/common/mcpm_platsmp.c @@ -15,8 +15,6 @@ #include <linux/smp.h> #include <linux/spinlock.h> -#include <linux/irqchip/arm-gic.h> - #include <asm/mcpm.h> #include <asm/smp.h> #include <asm/smp_plat.h> @@ -49,7 +47,6 @@ static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *i static void __cpuinit mcpm_secondary_init(unsigned int cpu) { mcpm_cpu_powered_up(); - gic_secondary_init(0); } #ifdef CONFIG_HOTPLUG_CPU |
