diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-30 01:47:55 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-30 01:47:55 +0200 |
| commit | 29cbc78b90a73ad80f2f58ba2927956cf663abed (patch) | |
| tree | e72fdb9c1c055da47b4cd8834bc944af8efc1ed8 /kernel | |
| parent | 013bf2c50ed943e9c23a2145d3ea7c4d88cda310 (diff) | |
[PATCH] x86: Clean up x86 NMI sysctls
Use prototypes in headers
Don't define panic_on_unrecovered_nmi for all architectures
Cc: dzickus@redhat.com
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/panic.c | 1 | ||||
| -rw-r--r-- | kernel/sysctl.c | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 6ceb664fb52..525e365f723 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -21,7 +21,6 @@ #include <linux/debug_locks.h> int panic_on_oops; -int panic_on_unrecovered_nmi; int tainted; static int pause_on_oops; static int pause_on_oops_flag; diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 9535a383993..c57c4532e29 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -52,6 +52,10 @@ extern int proc_nr_files(ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos); +#ifdef CONFIG_X86 +#include <asm/nmi.h> +#endif + #if defined(CONFIG_SYSCTL) /* External variables not in a header file. */ @@ -74,13 +78,6 @@ extern int sysctl_drop_caches; extern int percpu_pagelist_fraction; extern int compat_log; -#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) -int unknown_nmi_panic; -int nmi_watchdog_enabled; -extern int proc_nmi_enabled(struct ctl_table *, int , struct file *, - void __user *, size_t *, loff_t *); -#endif - /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ static int maxolduid = 65535; static int minolduid; |