diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 19:34:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 19:34:44 +0200 |
| commit | 6394d6d01bf0881823522f37601cbf880bc61087 (patch) | |
| tree | e5827ff7dc8b63014d9b068037ce50a5861b0f46 /kernel/watchdog.c | |
| parent | staging: unisys: use schedule_timeout_interruptible() (diff) | |
| parent | Linux 4.1-rc7 (diff) | |
| download | linux-6394d6d01bf0881823522f37601cbf880bc61087.tar.xz linux-6394d6d01bf0881823522f37601cbf880bc61087.zip | |
Merge 4.1-rc7 into staging-testing
We want the staging tree fixes in here too to help with testing and
merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/watchdog.c')
| -rw-r--r-- | kernel/watchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 506edcc500c4..581a68a04c64 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -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) |