aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)
632static void gic_smp_init(void) 632static void gic_smp_init(void)
633{ 633{
634 set_smp_cross_call(gic_raise_softirq); 634 set_smp_cross_call(gic_raise_softirq);
635 cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GICV3_STARTING, 635 cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GIC_STARTING,
636 "irqchip/arm/gicv3:starting", 636 "irqchip/arm/gicv3:starting",
637 gic_starting_cpu, NULL); 637 gic_starting_cpu, NULL);
638} 638}
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 {
80 CPUHP_AP_SCHED_STARTING, 80 CPUHP_AP_SCHED_STARTING,
81 CPUHP_AP_RCUTREE_DYING, 81 CPUHP_AP_RCUTREE_DYING,
82 CPUHP_AP_IRQ_GIC_STARTING, 82 CPUHP_AP_IRQ_GIC_STARTING,
83 CPUHP_AP_IRQ_GICV3_STARTING,
84 CPUHP_AP_IRQ_HIP04_STARTING, 83 CPUHP_AP_IRQ_HIP04_STARTING,
85 CPUHP_AP_IRQ_ARMADA_XP_STARTING, 84 CPUHP_AP_IRQ_ARMADA_XP_STARTING,
86 CPUHP_AP_IRQ_ARMADA_CASC_STARTING, 85 CPUHP_AP_IRQ_ARMADA_CASC_STARTING,