Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6896bcd1 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Link: http://lkml.kernel.org/r/20161221192112.252416267@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 36e5b0e3

drivers/irqchip/irq-gic-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

include/linux/cpuhotplug.h

+0 −1
Original line number Diff line number Diff line
@@ -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,