diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-02 02:05:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-02 02:05:42 -0400 |
| commit | f407a8258610169cd8e975dba7f0b2824562014c (patch) | |
| tree | 6c87b2d168a4665411a9e16b9f481599f2db25bc /kernel/watchdog.c | |
| parent | 960d447b94b22ceba286917056871d1dac8da697 (diff) | |
| parent | c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 (diff) | |
Merge branch 'linus' into sched/core, to resolve conflict
Conflicts:
arch/sparc/include/asm/topology_64.h
Signed-off-by: Ingo Molnar <mingo@kernel.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) | |||
| 621 | put_online_cpus(); | 621 | put_online_cpus(); |
| 622 | 622 | ||
| 623 | unlock: | 623 | unlock: |
| 624 | mutex_lock(&watchdog_proc_mutex); | 624 | mutex_unlock(&watchdog_proc_mutex); |
| 625 | } | 625 | } |
| 626 | 626 | ||
| 627 | void watchdog_nmi_disable_all(void) | 627 | void watchdog_nmi_disable_all(void) |