diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-02-12 22:19:19 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-14 08:19:43 (GMT) |
| commit | 504d7cf10ee42bb76b9556859f23d4121dee0a77 (patch) | |
| tree | edaa43a7c221f0926d150dbbeb38abc5fe0f1cc6 /kernel/sysctl.c | |
| parent | c3128fb6ad39b0edda6675d20585a64846cf89ea (diff) | |
| download | linux-504d7cf10ee42bb76b9556859f23d4121dee0a77.tar.xz | |
nmi_watchdog: Compile and portability fixes
The original patch was x86_64 centric. Changed the code to make
it less so.
ested by building and running on a powerpc.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: peterz@infradead.org
Cc: gorcunov@gmail.com
Cc: aris@redhat.com
LKML-Reference: <1266013161-31197-2-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8a68b24..ac72c9e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -60,6 +60,10 @@ #include <asm/io.h> #endif +#ifdef CONFIG_NMI_WATCHDOG +#include <linux/nmi.h> +#endif + #if defined(CONFIG_SYSCTL) @@ -692,7 +696,16 @@ static struct ctl_table kern_table[] = { .mode = 0444, .proc_handler = proc_dointvec, }, -#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) +#if defined(CONFIG_NMI_WATCHDOG) + { + .procname = "nmi_watchdog", + .data = &nmi_watchdog_enabled, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = proc_nmi_enabled, + }, +#endif +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) && !defined(CONFIG_NMI_WATCHDOG) { .procname = "unknown_nmi_panic", .data = &unknown_nmi_panic, |