From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764068AbcLUTaX (ORCPT ); Wed, 21 Dec 2016 14:30:23 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:60019 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761743AbcLUT2w (ORCPT ); Wed, 21 Dec 2016 14:28:52 -0500 Message-Id: <20161221192112.333161745@linutronix.de> User-Agent: quilt/0.63-1 Date: Wed, 21 Dec 2016 20:19:57 +0100 From: Thomas Gleixner To: LKML Cc: Sebastian Siewior , Ingo Molnar , Peter Zijlstra , Thomas Petazzoni , Marc Zyngier Subject: [patch 10/10] irqchip/armada-xp: Consolidate hotplug state space References: <20161221191947.089046759@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=irqchip-armada-xp--Consolidate-hotplug-state-space.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The mpic is either the main interrupt controller or sits behind a GIC. But there is no way that both variants are available on the same system. Share the cpu hotplug state. Signed-off-by: Thomas Gleixner Cc: Thomas Petazzoni Cc: Marc Zyngier --- drivers/irqchip/irq-armada-370-xp.c | 2 +- include/linux/cpuhotplug.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) --- 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_ #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 --- 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,