openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM/hw_breakpoint: Fix possible recursive locking for arch_hw_breakpoint_init 

Recent change to use cpuhp_setup_state_cpuslocked() with commit
fe2a5cd8aa ("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: fe2a5cd8aa ("ARM/hw_breakpoint: Use cpuhp_setup_state_cpuslocked()")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-omap@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: "Paul E . McKenney" <paulmck@linux.vnet.ibm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/20170616082238.15553-1-tony@atomide.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Tony Lindgren 2017-06-16 01:22:38 -07:00 committed by Thomas Gleixner
parent 57de72125d
commit 1b3b22507e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/hw_breakpoint.c
View File

@ -1106,7 +1106,7 @@ static int __init arch_hw_breakpoint_init(void)
core_num_brps = 0; core_num_brps = 0;
core_num_wrps = 0; core_num_wrps = 0;
if (ret > 0) if (ret > 0)
cpuhp_remove_state_nocalls(ret); cpuhp_remove_state_nocalls_cpuslocked(ret);
cpus_read_unlock(); cpus_read_unlock();
return 0; return 0;
} }