Commit-ID: 1b3b22507e0d45dedc6a54b26d56e0b8c4d36875
Gitweb: http://git.kernel.org/tip/1b3b22507e0d45dedc6a54b26d56e0b8c4d36875
Author: Tony Lindgren <t...@atomide.com>
AuthorDate: Fri, 16 Jun 2017 01:22:38 -0700
Committer: Thomas Gleixner <t...@linutronix.de>
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 <t...@atomide.com>
Acked-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: linux-o...@vger.kernel.org
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Will Deacon <will.dea...@arm.com>
Cc: Steven Rostedt <rost...@goodmis.org>
Cc: Russell King <li...@armlinux.org.uk>
Cc: "Paul E . McKenney" <paul...@linux.vnet.ibm.com>
Cc: linux-arm-ker...@lists.infradead.org
Link: http://lkml.kernel.org/r/20170616082238.15553-1-t...@atomide.com
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
---
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;
}
