tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Thomas Gleixner 6896bcd1 36e5b0e3

+1 -2
unified split
+1 -1
drivers/irqchip/irq-gic-v3.c
··· 632 632 static void gic_smp_init(void) 633 633 { 634 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 636 "irqchip/arm/gicv3:starting", 637 637 gic_starting_cpu, NULL); 638 638 }
-1
include/linux/cpuhotplug.h
··· 80 80 CPUHP_AP_SCHED_STARTING, 81 81 CPUHP_AP_RCUTREE_DYING, 82 82 CPUHP_AP_IRQ_GIC_STARTING, 83 - CPUHP_AP_IRQ_GICV3_STARTING, 84 83 CPUHP_AP_IRQ_HIP04_STARTING, 85 84 CPUHP_AP_IRQ_ARMADA_XP_STARTING, 86 85 CPUHP_AP_IRQ_ARMADA_CASC_STARTING,