diff options
| author | Ulrich Obergfell <uobergfe@redhat.com> | 2015-11-05 18:44:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 19:34:48 -0800 |
| commit | c993590c6ae6273681d9fb2a8d26dce03bf9d96c (patch) | |
| tree | 7a920849133ef3296975b5febbb567bcc532e203 /kernel | |
| parent | b43cb43cb85b91d79d9f0719ff581e8cb6dfbb8f (diff) | |
watchdog: implement error handling in lockup_detector_suspend()
lockup_detector_suspend() now handles errors from watchdog_park_threads().
Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
Reviewed-by: Aaron Tomlin <atomlin@redhat.com>
Acked-by: Don Zickus <dzickus@redhat.com>
Cc: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/watchdog.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 704f93317666..e8b19db9c14a 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -707,6 +707,11 @@ int lockup_detector_suspend(void) if (ret == 0) watchdog_suspended++; + else { + watchdog_disable_all_cpus(); + pr_err("Failed to suspend lockup detectors, disabled\n"); + watchdog_enabled = 0; + } mutex_unlock(&watchdog_proc_mutex); |