diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-11-29 17:07:17 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-10 00:01:06 +0100 |
| commit | 5dc3055879b8f659f62abb7c3d1eaa4d02e36d65 (patch) | |
| tree | 823b69dd3ed28bc9d05fc4ecf31e780341efdf5b /arch/x86/kernel/apic | |
| parent | 96a84c20d635fb1e98ab92f9fc517c4441f5c424 (diff) | |
| download | blackbird-op-linux-5dc3055879b8f659f62abb7c3d1eaa4d02e36d65.tar.gz blackbird-op-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 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/hw_nmi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c index 2e94eb493591..c558e1101edf 100644 --- a/arch/x86/kernel/apic/hw_nmi.c +++ b/arch/x86/kernel/apic/hw_nmi.c @@ -99,6 +99,3 @@ static int __init register_trigger_all_cpu_backtrace(void) } early_initcall(register_trigger_all_cpu_backtrace); #endif - -/* STUB calls to mimic old nmi_watchdog behaviour */ -int unknown_nmi_panic; |
