diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-11-29 23:07:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-10 00:01:06 +0100 |
| commit | 5dc3055879b8f659f62abb7c3d1eaa4d02e36d65 (patch) | |
| tree | 823b69dd3ed28bc9d05fc4ecf31e780341efdf5b /kernel/watchdog.c | |
| parent | lockup detector: Compile fixes from removing the old x86 nmi watchdog (diff) | |
| download | linux-5dc3055879b8f659f62abb7c3d1eaa4d02e36d65.tar.xz linux-5dc3055879b8f659f62abb7c3d1eaa4d02e36d65.zip | |
x86, NMI: Add back unknown_nmi_panic and nmi_watchdog sysctls
Originally adapted from Huang Ying's patch which moved the
unknown_nmi_panic to the traps.c file. Because the old nmi
watchdog was deleted before this change happened, the
unknown_nmi_panic sysctl was lost. This re-adds it.
Also, the nmi_watchdog sysctl was re-implemented and its
documentation updated accordingly.
Patch-inspired-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: fweisbec@gmail.com
LKML-Reference: <1291068437-5331-3-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/watchdog.c')
| -rw-r--r-- | kernel/watchdog.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index cad4e42060a9..eb17e143b5da 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -57,6 +57,8 @@ static int __init hardlockup_panic_setup(char *str) { if (!strncmp(str, "panic", 5)) hardlockup_panic = 1; + else if (!strncmp(str, "0", 1)) + no_watchdog = 1; return 1; } __setup("nmi_watchdog=", hardlockup_panic_setup); |