From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753562AbcLYKI1 (ORCPT ); Sun, 25 Dec 2016 05:08:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:40756 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751742AbcLYKIZ (ORCPT ); Sun, 25 Dec 2016 05:08:25 -0500 Date: Sun, 25 Dec 2016 02:07:52 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: peterz@infradead.org, bigeasy@linutronix.de, tglx@linutronix.de, mathieu.poirier@linaro.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: peterz@infradead.org, bigeasy@linutronix.de, tglx@linutronix.de, mathieu.poirier@linaro.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <20161221192112.162765484@linutronix.de> References: <20161221192112.162765484@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/urgent] coresight/etm3/4x: Consolidate hotplug state space Git-Commit-ID: 36e5b0e39194b09a10f19697fb9ea4ccc44eb166 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: 36e5b0e39194b09a10f19697fb9ea4ccc44eb166 Gitweb: http://git.kernel.org/tip/36e5b0e39194b09a10f19697fb9ea4ccc44eb166 Author: Thomas Gleixner AuthorDate: Wed, 21 Dec 2016 20:19:55 +0100 Committer: Thomas Gleixner CommitDate: Sun, 25 Dec 2016 10:47:44 +0100 coresight/etm3/4x: Consolidate hotplug state space Even if both drivers are compiled in only one instance can run on a given system depending on the available tracer cell. So having seperate hotplug states for them is pointless. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Sebastian Siewior Cc: Mathieu Poirier Link: http://lkml.kernel.org/r/20161221192112.162765484@linutronix.de Signed-off-by: Thomas Gleixner --- drivers/hwtracing/coresight/coresight-etm4x.c | 4 ++-- include/linux/cpuhotplug.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 5edc63f..031480f 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -986,7 +986,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) dev_err(dev, "ETM arch init failed\n"); if (!etm4_count++) { - cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING, + cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING, "arm/coresight4:starting", etm4_starting_cpu, etm4_dying_cpu); ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, @@ -1037,7 +1037,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) err_arch_supported: if (--etm4_count == 0) { - cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING); + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); if (hp_online) cpuhp_remove_state_nocalls(hp_online); } diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 0d5ef85..4a938be 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -119,7 +119,6 @@ enum cpuhp_state { CPUHP_AP_DUMMY_TIMER_STARTING, CPUHP_AP_ARM_XEN_STARTING, CPUHP_AP_ARM_CORESIGHT_STARTING, - CPUHP_AP_ARM_CORESIGHT4_STARTING, CPUHP_AP_ARM64_ISNDEP_STARTING, CPUHP_AP_SMPCFD_DYING, CPUHP_AP_X86_TBOOT_DYING,