Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1546568
| From | tip-bot for Thomas Gleixner <tipbot@zytor.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [tip:smp/urgent] irqchip/armada-xp: Consolidate hotplug state space |
| Date | 2016-12-22 21:30 +0100 |
| Message-ID | <sRi9X-5GP-11@gated-at.bofh.it> (permalink) |
| References | <sQUU1-7y3-13@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Commit-ID: 504dcba246a5bc451bd7f37d8da3de11310cad71
Gitweb: http://git.kernel.org/tip/504dcba246a5bc451bd7f37d8da3de11310cad71
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 21 Dec 2016 20:19:57 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 22 Dec 2016 11:37:56 +0100
irqchip/armada-xp: Consolidate hotplug state space
The mpic is either the main interrupt controller or is cascaded behind a
GIC. The mpic is single instance and the modes are mutually exclusive, so
there is no reason to have seperate cpu hotplug states.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Link: http://lkml.kernel.org/r/20161221192112.333161745@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/irqchip/irq-armada-370-xp.c | 2 +-
include/linux/cpuhotplug.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 9d9c2c4..eb0d4d4 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -583,7 +583,7 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
#endif
} else {
#ifdef CONFIG_SMP
- cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_CASC_STARTING,
+ cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_XP_STARTING,
"irqchip/armada/cascade:starting",
mpic_cascaded_starting_cpu, NULL);
#endif
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 45c786c..20bfefb 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -82,7 +82,6 @@ enum cpuhp_state {
CPUHP_AP_IRQ_GIC_STARTING,
CPUHP_AP_IRQ_HIP04_STARTING,
CPUHP_AP_IRQ_ARMADA_XP_STARTING,
- CPUHP_AP_IRQ_ARMADA_CASC_STARTING,
CPUHP_AP_IRQ_BCM2836_STARTING,
CPUHP_AP_ARM_MVEBU_COHERENCY,
CPUHP_AP_PERF_X86_UNCORE_STARTING,
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[patch 10/10] irqchip/armada-xp: Consolidate hotplug state space Thomas Gleixner <tglx@linutronix.de> - 2016-12-21 20:40 +0100
Re: [patch 10/10] irqchip/armada-xp: Consolidate hotplug state space Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - 2016-12-21 21:30 +0100
Re: [patch 10/10] irqchip/armada-xp: Consolidate hotplug state space Thomas Gleixner <tglx@linutronix.de> - 2016-12-21 21:30 +0100
[tip:smp/urgent] irqchip/armada-xp: Consolidate hotplug state space tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2016-12-22 21:30 +0100
[tip:smp/urgent] irqchip/armada-xp: Consolidate hotplug state space tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2016-12-25 11:10 +0100
csiph-web