summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-12-21 20:19:56 +0100
committerThomas Gleixner <tglx@linutronix.de>2016-12-25 10:47:44 +0100
commit6896bcd198df04777820cab4acc70142e87d5ce0 (patch)
tree9d23bb6b094b19b3f32ced94f633e1222e665254
parent36e5b0e39194b09a10f19697fb9ea4ccc44eb166 (diff)
downloadlinux-stable-6896bcd198df04777820cab4acc70142e87d5ce0.tar.gz
linux-stable-6896bcd198df04777820cab4acc70142e87d5ce0.tar.bz2
linux-stable-6896bcd198df04777820cab4acc70142e87d5ce0.zip
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 <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: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--drivers/irqchip/irq-gic-v3.c2
-rw-r--r--include/linux/cpuhotplug.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index d696de1a29fb..c132f29322cc 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 4a938bee5858..45c786cbb324 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,