Commit 1173ff09 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds

watchdog: fix double lock in watchdog_nmi_enable_all

Commit ab992dc3 ("watchdog: Fix merge 'conflict'") has introduced an
obvious deadlock because of a typo.  watchdog_proc_mutex should be
unlocked on exit.

Thanks to Miroslav Benes who was staring at the code with me and noticed
this.
Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
Duh-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e2608180
......@@ -621,7 +621,7 @@ void watchdog_nmi_enable_all(void)
put_online_cpus();
unlock:
mutex_lock(&watchdog_proc_mutex);
mutex_unlock(&watchdog_proc_mutex);
}
void watchdog_nmi_disable_all(void)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment