diff options
| author |   Cyrill Gorcunov <gorcunov@gmail.com> | 2008-06-24 22:52:06 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:51:42 +0200 |
| commit | 4de0043617f949fdac538fd59335e2150cd1b863 (patch) | |
| tree | 5f2264477030a8f3e65807537d3e717aabd2c514 /arch/x86/kernel/nmi.c | |
| parent | x86: nmi_watchdog - use NMI_NONE by default (diff) | |
| download | linux-dev-4de0043617f949fdac538fd59335e2150cd1b863.tar.xz linux-dev-4de0043617f949fdac538fd59335e2150cd1b863.zip | |
x86: nmi_watchdog - introduce nmi_watchdog_active() helper
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: macro@linux-mips.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/nmi.c')
| -rw-r--r-- | arch/x86/kernel/nmi.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 32acda25e3cb..8dfe9db87a9e 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -119,10 +119,7 @@ int __init check_nmi_watchdog(void) unsigned int *prev_nmi_count; int cpu; - if (nmi_watchdog == NMI_NONE) - return 0; - - if (!atomic_read(&nmi_active)) + if (!nmi_watchdog_active() || !atomic_read(&nmi_active)) return 0; prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(int), GFP_KERNEL); @@ -317,8 +314,7 @@ void setup_apic_nmi_watchdog(void *unused) void stop_apic_nmi_watchdog(void *unused) { /* only support LOCAL and IO APICs for now */ - if (nmi_watchdog != NMI_LOCAL_APIC && - nmi_watchdog != NMI_IO_APIC) + if (!nmi_watchdog_active()) return; if (__get_cpu_var(wd_enabled) == 0) return; @@ -348,8 +344,7 @@ static DEFINE_PER_CPU(int, nmi_touch); void touch_nmi_watchdog(void) { - if (nmi_watchdog == NMI_LOCAL_APIC || - nmi_watchdog == NMI_IO_APIC) { + if (nmi_watchdog_active()) { unsigned cpu; /* @@ -474,7 +469,7 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, if (!!old_state == !!nmi_watchdog_enabled) return 0; - if (atomic_read(&nmi_active) < 0 || nmi_watchdog == NMI_NONE) { + if (atomic_read(&nmi_active) < 0 || !nmi_watchdog_active()) { printk(KERN_WARNING "NMI watchdog is permanently disabled\n"); return -EIO; |