aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2006-09-26 04:52:27 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:27 -0400
commit407984f1af259b31957c7c05075a454a751bb801 (patch)
tree1e9318b4255957c27a4dbacd84711604bf789393 /include
parent2fbe7b25c8edaf2d10e6c1a4cc9f8afe714c4764 (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 'include')
-rw-r--r--include/asm-i386/nmi.h1
-rw-r--r--include/asm-x86_64/nmi.h1
-rw-r--r--include/linux/sysctl.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-i386/nmi.h b/include/asm-i386/nmi.h
index 34d6bf063b6e..13b5d8311bf7 100644
--- a/include/asm-i386/nmi.h
+++ b/include/asm-i386/nmi.h
@@ -14,6 +14,7 @@
14 */ 14 */
15int do_nmi_callback(struct pt_regs *regs, int cpu); 15int do_nmi_callback(struct pt_regs *regs, int cpu);
16 16
17extern int nmi_watchdog_enabled;
17extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); 18extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
18extern int avail_to_resrv_perfctr_nmi(unsigned int); 19extern int avail_to_resrv_perfctr_nmi(unsigned int);
19extern int reserve_perfctr_nmi(unsigned int); 20extern int reserve_perfctr_nmi(unsigned int);
diff --git a/include/asm-x86_64/nmi.h b/include/asm-x86_64/nmi.h
index 8818c39d34e0..2c23b0df87d2 100644
--- a/include/asm-x86_64/nmi.h
+++ b/include/asm-x86_64/nmi.h
@@ -43,6 +43,7 @@ extern void die_nmi(char *str, struct pt_regs *regs);
43 43
44extern int panic_on_timeout; 44extern int panic_on_timeout;
45extern int unknown_nmi_panic; 45extern int unknown_nmi_panic;
46extern int nmi_watchdog_enabled;
46 47
47extern int check_nmi_watchdog(void); 48extern int check_nmi_watchdog(void);
48extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); 49extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 736ed917a4f8..ecb79ba52ae1 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -150,6 +150,7 @@ enum
150 KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */ 150 KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
151 KERN_COMPAT_LOG=73, /* int: print compat layer messages */ 151 KERN_COMPAT_LOG=73, /* int: print compat layer messages */
152 KERN_MAX_LOCK_DEPTH=74, 152 KERN_MAX_LOCK_DEPTH=74,
153 KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
153}; 154};
154 155
155 156