diff options
| author | Eric Anholt <eric@anholt.net> | 2016-04-13 13:28:41 -0700 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2016-05-11 10:12:45 +0100 |
| commit | 0dc17be87647cd4c891e748a0753ad0606dc5775 (patch) | |
| tree | d6c6993e2695a736e6e72eada27fbb0af2326c56 | |
| parent | d6490461a102094891d8a2712c51365f86ac1a40 (diff) | |
| download | linux-0dc17be87647cd4c891e748a0753ad0606dc5775.tar.gz linux-0dc17be87647cd4c891e748a0753ad0606dc5775.tar.bz2 linux-0dc17be87647cd4c891e748a0753ad0606dc5775.zip | |
irqchip/bcm2836: Drop smp_set_ops on arm64 builds
For arm64, the bootloader will instead be implementing the spin-table
enable method.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
| -rw-r--r-- | drivers/irqchip/irq-bcm2836.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c index b6e950d4782a..43aefb25bb5f 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -223,6 +223,7 @@ static struct notifier_block bcm2836_arm_irqchip_cpu_notifier = { .priority = 100, }; +#ifdef CONFIG_ARM int __init bcm2836_smp_boot_secondary(unsigned int cpu, struct task_struct *idle) { @@ -238,7 +239,7 @@ int __init bcm2836_smp_boot_secondary(unsigned int cpu, static const struct smp_operations bcm2836_smp_ops __initconst = { .smp_boot_secondary = bcm2836_smp_boot_secondary, }; - +#endif #endif static const struct irq_domain_ops bcm2836_arm_irqchip_intc_ops = { @@ -256,8 +257,11 @@ bcm2836_arm_irqchip_smp_init(void) register_cpu_notifier(&bcm2836_arm_irqchip_cpu_notifier); set_smp_cross_call(bcm2836_arm_irqchip_send_ipi); + +#ifdef CONFIG_ARM smp_set_ops(&bcm2836_smp_ops); #endif +#endif } /* |