From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030695AbdDTL0e (ORCPT ); Thu, 20 Apr 2017 07:26:34 -0400 Received: from terminus.zytor.com ([65.50.211.136]:58379 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942371AbdDTL03 (ORCPT ); Thu, 20 Apr 2017 07:26:29 -0400 Date: Thu, 20 Apr 2017 04:22:56 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: peterz@infradead.org, mathieu.poirier@linaro.org, mingo@kernel.org, tglx@linutronix.de, rostedt@goodmis.org, bigeasy@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: rostedt@goodmis.org, tglx@linutronix.de, mingo@kernel.org, mathieu.poirier@linaro.org, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, bigeasy@linutronix.de In-Reply-To: <20170418170553.108514162@linutronix.de> References: <20170418170553.108514162@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] hwtracing/coresight-etm4x: Use cpuhp_setup_state_nocalls_cpuslocked() Git-Commit-ID: 91e555edde960481085a8a69ac32726a9f6df0c9 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: 91e555edde960481085a8a69ac32726a9f6df0c9 Gitweb: http://git.kernel.org/tip/91e555edde960481085a8a69ac32726a9f6df0c9 Author: Sebastian Andrzej Siewior AuthorDate: Tue, 18 Apr 2017 19:04:51 +0200 Committer: Thomas Gleixner CommitDate: Thu, 20 Apr 2017 13:08:53 +0200 hwtracing/coresight-etm4x: Use cpuhp_setup_state_nocalls_cpuslocked() etm_probe4() holds get_online_cpus() while invoking cpuhp_setup_state_nocalls(). cpuhp_setup_state_nocalls() invokes get_online_cpus() as well. This is correct, but prevents the conversion of the hotplug locking to a percpu rwsem. Use cpuhp_setup_state_nocalls_cpuslocked() to avoid the nested call. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Cc: Mathieu Poirier Cc: Peter Zijlstra Cc: Steven Rostedt Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20170418170553.108514162@linutronix.de --- drivers/hwtracing/coresight/coresight-etm4x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index d1340fb..bd3046c 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -990,12 +990,12 @@ 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_CORESIGHT_STARTING, - "arm/coresight4:starting", - etm4_starting_cpu, etm4_dying_cpu); - ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, - "arm/coresight4:online", - etm4_online_cpu, NULL); + cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ARM_CORESIGHT_STARTING, + "arm/coresight4:starting", + etm4_starting_cpu, etm4_dying_cpu); + ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN, + "arm/coresight4:online", + etm4_online_cpu, NULL); if (ret < 0) goto err_arch_supported; hp_online = ret;