]> git.baikalelectronics.ru Git - kernel.git/commit
watchdog: fix double lock in watchdog_nmi_enable_all
authorMichal Hocko <mhocko@suse.cz>
Tue, 19 May 2015 07:07:27 +0000 (09:07 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 May 2015 17:57:03 +0000 (10:57 -0700)
commitbdce88a91273212c9ae0ca519b4794bbf8d430ab
tree2c6b5593ae16580db22cef26585f743b8fe6f02c
parent459ce5742371391c62dbab6c7c9603c8f569a30a
watchdog: fix double lock in watchdog_nmi_enable_all

Commit eced94483350 ("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: Michal Hocko <mhocko@suse.cz>
Duh-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/watchdog.c