watchdog: fix double lock in watchdog_nmi_enable_all

Commit ab992dc38f9a ("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>

watchdog: fix double lock in watchdog_nmi_enable_all
Commit ab992dc38f9a ("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>
Michal Hocko · Linus Torvalds
1 parent e26081808e
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
kernel/watchdog.c
@@ -621,7 +621,7 @@
 	put_online_cpus();
  
 unlock:
-	mutex_lock(&watchdog_proc_mutex);
+	mutex_unlock(&watchdog_proc_mutex);
 }
  
 void watchdog_nmi_disable_all(void)
...	...	@@ -621,7 +621,7 @@
621	621	put_online_cpus();
622	622
623	623	unlock:
624		- mutex_lock(&watchdog_proc_mutex);
	624	+ mutex_unlock(&watchdog_proc_mutex);
625	625	}
626	626
627	627	void watchdog_nmi_disable_all(void)