From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753692AbcLYKI7 (ORCPT ); Sun, 25 Dec 2016 05:08:59 -0500 Received: from terminus.zytor.com ([198.137.202.10]:40822 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752547AbcLYKI5 (ORCPT ); Sun, 25 Dec 2016 05:08:57 -0500 Date: Sun, 25 Dec 2016 02:08:22 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: tglx@linutronix.de, bigeasy@linutronix.de, hpa@zytor.com, marc.zyngier@arm.com, mingo@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, peterz@infradead.org, hpa@zytor.com, bigeasy@linutronix.de, tglx@linutronix.de, marc.zyngier@arm.com, mingo@kernel.org In-Reply-To: <20161221192112.252416267@linutronix.de> References: <20161221192112.252416267@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/urgent] irqchip/gic: Consolidate hotplug state space Git-Commit-ID: 6896bcd198df04777820cab4acc70142e87d5ce0 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: 6896bcd198df04777820cab4acc70142e87d5ce0 Gitweb: http://git.kernel.org/tip/6896bcd198df04777820cab4acc70142e87d5ce0 Author: Thomas Gleixner AuthorDate: Wed, 21 Dec 2016 20:19:56 +0100 Committer: Thomas Gleixner CommitDate: Sun, 25 Dec 2016 10:47:44 +0100 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 Cc: Peter Zijlstra Cc: Marc Zyngier Cc: Sebastian Siewior Link: http://lkml.kernel.org/r/20161221192112.252416267@linutronix.de Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-gic-v3.c | 2 +- include/linux/cpuhotplug.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index d696de1..c132f29 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) static void gic_smp_init(void) { set_smp_cross_call(gic_raise_softirq); - cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GICV3_STARTING, + cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GIC_STARTING, "irqchip/arm/gicv3:starting", gic_starting_cpu, NULL); } diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 4a938be..45c786c 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -80,7 +80,6 @@ enum cpuhp_state { CPUHP_AP_SCHED_STARTING, CPUHP_AP_RCUTREE_DYING, CPUHP_AP_IRQ_GIC_STARTING, - CPUHP_AP_IRQ_GICV3_STARTING, CPUHP_AP_IRQ_HIP04_STARTING, CPUHP_AP_IRQ_ARMADA_XP_STARTING, CPUHP_AP_IRQ_ARMADA_CASC_STARTING,