On Fri, Jun 16, 2017 at 01:22:38AM -0700, Tony Lindgren wrote: > 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()") > Cc: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> > Cc: Ingo Molnar <mingo@xxxxxxxxxx> > Cc: Mark Rutland <mark.rutland@xxxxxxx> > Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx> > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > Cc: Will Deacon <will.deacon@xxxxxxx> > Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> > Cc: Russell King <linux@xxxxxxxxxxxxxxx> > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> > --- > arch/arm/kernel/hw_breakpoint.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This looks correct to me, so I guess it should go via -tip (where the problematic patch is queued already). Will > diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c > --- 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; > } > -- > 2.13.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html