Commit-ID: 8fe1c3c1b44a5afe44279178afec705fad55c8c4 Gitweb: http://git.kernel.org/tip/8fe1c3c1b44a5afe44279178afec705fad55c8c4 Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Wed, 21 Dec 2016 20:19:56 +0100 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Thu, 22 Dec 2016 11:37:56 +0100
irqchip/gic: Consolidate hotplug state space Even if both drivers are compiled in only one instance can run on a given system depending on the available GIC version. So having seperate hotplug states for them is pointless. Signed-off-by: Thomas Gleixner <t...@linutronix.de> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Marc Zyngier <marc.zyng...@arm.com> Cc: Sebastian Siewior <bige...@linutronix.de> Link: http://lkml.kernel.org/r/20161221192112.252416...@linutronix.de Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- drivers/irqchip/irq-gic-v3.c | 2 +- include/linux/cpuhotplug.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index d696de1..c132f29 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -632,7 +632,7 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) static void gic_smp_init(void) { set_smp_cross_call(gic_raise_softirq); - cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GICV3_STARTING, + cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GIC_STARTING, "irqchip/arm/gicv3:starting", gic_starting_cpu, NULL); } diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 4a938be..45c786c 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -80,7 +80,6 @@ enum cpuhp_state { CPUHP_AP_SCHED_STARTING, CPUHP_AP_RCUTREE_DYING, CPUHP_AP_IRQ_GIC_STARTING, - CPUHP_AP_IRQ_GICV3_STARTING, CPUHP_AP_IRQ_HIP04_STARTING, CPUHP_AP_IRQ_ARMADA_XP_STARTING, CPUHP_AP_IRQ_ARMADA_CASC_STARTING,
