From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941594AbcLVU0i (ORCPT ); Thu, 22 Dec 2016 15:26:38 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42916 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754170AbcLVU0f (ORCPT ); Thu, 22 Dec 2016 15:26:35 -0500 Date: Thu, 22 Dec 2016 12:25:15 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: thomas.petazzoni@free-electrons.com, hpa@zytor.com, tglx@linutronix.de, marc.zyngier@arm.com, mingo@kernel.org, peterz@infradead.org, bigeasy@linutronix.de, linux-kernel@vger.kernel.org Reply-To: bigeasy@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, marc.zyngier@arm.com, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org, thomas.petazzoni@free-electrons.com In-Reply-To: <20161221192112.333161745@linutronix.de> References: <20161221192112.333161745@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/urgent] irqchip/armada-xp: Consolidate hotplug state space Git-Commit-ID: 504dcba246a5bc451bd7f37d8da3de11310cad71 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 504dcba246a5bc451bd7f37d8da3de11310cad71 Gitweb: http://git.kernel.org/tip/504dcba246a5bc451bd7f37d8da3de11310cad71 Author: Thomas Gleixner AuthorDate: Wed, 21 Dec 2016 20:19:57 +0100 Committer: Thomas Gleixner 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 Cc: Peter Zijlstra Cc: Thomas Petazzoni Cc: Sebastian Siewior Cc: Marc Zyngier Link: http://lkml.kernel.org/r/20161221192112.333161745@linutronix.de Signed-off-by: Thomas Gleixner --- 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,