evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

watchdog: fix double lock in watchdog_nmi_enable_all

Browse source 
Commit ab992dc38f ("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>
This commit is contained in:
Michal Hocko 2015-05-19 09:07:27 +02:00 • committed by Linus Torvalds
parent e26081808e
commit 1173ff09b9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/watchdog.c
View file

@ -621,7 +621,7 @@ void watchdog_nmi_enable_all(void)
put_online_cpus(); put_online_cpus();
unlock: unlock:
mutex_lock(&watchdog_proc_mutex); mutex_unlock(&watchdog_proc_mutex);
} }
void watchdog_nmi_disable_all(void) void watchdog_nmi_disable_all(void)