diff options
author | Don Zickus <dzickus@redhat.com> | 2006-09-26 04:52:27 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:27 -0400 |
commit | 407984f1af259b31957c7c05075a454a751bb801 (patch) | |
tree | 1e9318b4255957c27a4dbacd84711604bf789393 /kernel/sysctl.c | |
parent | 2fbe7b25c8edaf2d10e6c1a4cc9f8afe714c4764 (diff) |
[PATCH] x86: Add abilty to enable/disable nmi watchdog with sysctl
Adds a new /proc/sys/kernel/nmi call that will enable/disable the nmi
watchdog.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 83f168361624..040de6bd74dd 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -76,6 +76,9 @@ extern int compat_log; | |||
76 | 76 | ||
77 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) | 77 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) |
78 | int unknown_nmi_panic; | 78 | int unknown_nmi_panic; |
79 | int nmi_watchdog_enabled; | ||
80 | extern int proc_nmi_enabled(struct ctl_table *, int , struct file *, | ||
81 | void __user *, size_t *, loff_t *); | ||
79 | #endif | 82 | #endif |
80 | 83 | ||
81 | /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ | 84 | /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ |
@@ -628,6 +631,14 @@ static ctl_table kern_table[] = { | |||
628 | .mode = 0644, | 631 | .mode = 0644, |
629 | .proc_handler = &proc_dointvec, | 632 | .proc_handler = &proc_dointvec, |
630 | }, | 633 | }, |
634 | { | ||
635 | .ctl_name = KERN_NMI_WATCHDOG, | ||
636 | .procname = "nmi_watchdog", | ||
637 | .data = &nmi_watchdog_enabled, | ||
638 | .maxlen = sizeof (int), | ||
639 | .mode = 0644, | ||
640 | .proc_handler = &proc_nmi_enabled, | ||
641 | }, | ||
631 | #endif | 642 | #endif |
632 | #if defined(CONFIG_X86) | 643 | #if defined(CONFIG_X86) |
633 | { | 644 | { |