From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752175AbdFTKcv (ORCPT ); Tue, 20 Jun 2017 06:32:51 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37669 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751007AbdFTKcs (ORCPT ); Tue, 20 Jun 2017 06:32:48 -0400 Date: Tue, 20 Jun 2017 03:27:59 -0700 From: tip-bot for Tony Lindgren Message-ID: Cc: tglx@linutronix.de, paulmck@linux.vnet.ibm.com, bigeasy@linutronix.de, linux@armlinux.org.uk, rostedt@goodmis.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, mingo@kernel.org, will.deacon@arm.com, hpa@zytor.com, peterz@infradead.org, tony@atomide.com Reply-To: tony@atomide.com, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, will.deacon@arm.com, mingo@kernel.org, mark.rutland@arm.com, rostedt@goodmis.org, linux@armlinux.org.uk, bigeasy@linutronix.de, paulmck@linux.vnet.ibm.com, tglx@linutronix.de In-Reply-To: <20170616082238.15553-1-tony@atomide.com> References: <20170616082238.15553-1-tony@atomide.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] ARM/hw_breakpoint: Fix possible recursive locking for arch_hw_breakpoint_init Git-Commit-ID: 1b3b22507e0d45dedc6a54b26d56e0b8c4d36875 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: 1b3b22507e0d45dedc6a54b26d56e0b8c4d36875 Gitweb: http://git.kernel.org/tip/1b3b22507e0d45dedc6a54b26d56e0b8c4d36875 Author: Tony Lindgren AuthorDate: Fri, 16 Jun 2017 01:22:38 -0700 Committer: Thomas Gleixner CommitDate: Tue, 20 Jun 2017 12:25:22 +0200 ARM/hw_breakpoint: Fix possible recursive locking for arch_hw_breakpoint_init Recent change to use cpuhp_setup_state_cpuslocked() with commit fe2a5cd8aa03 ("ARM/hw_breakpoint: Use cpuhp_setup_state_cpuslocked()") missed to change the related paired cpuhp_remove_state_nocalls_cpuslocked(). Now if arch_hw_breakpoint_init() fails, we get "WARNING: possible recursive locking detected" on the exit path. Fixes: fe2a5cd8aa03 ("ARM/hw_breakpoint: Use cpuhp_setup_state_cpuslocked()") Signed-off-by: Tony Lindgren Acked-by: Sebastian Andrzej Siewior Cc: Mark Rutland Cc: linux-omap@vger.kernel.org Cc: Peter Zijlstra Cc: Will Deacon Cc: Steven Rostedt Cc: Russell King Cc: "Paul E . McKenney" Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20170616082238.15553-1-tony@atomide.com Signed-off-by: Thomas Gleixner --- arch/arm/kernel/hw_breakpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index 63cb4c7..af2a7f1 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -1106,7 +1106,7 @@ static int __init arch_hw_breakpoint_init(void) core_num_brps = 0; core_num_wrps = 0; if (ret > 0) - cpuhp_remove_state_nocalls(ret); + cpuhp_remove_state_nocalls_cpuslocked(ret); cpus_read_unlock(); return 0; }