lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: nmi_watchdog - introduce nmi_watchdog_active() helper

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: macro@linux-mips.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov
2008-06-24 22:52:06 +02:00
committed by Ingo Molnar
parent c376d45432
commit 4de0043617
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/kernel/nmi.c
View File

@@ -119,10 +119,7 @@ int __init check_nmi_watchdog(void)
unsigned int *prev_nmi_count; unsigned int *prev_nmi_count;
int cpu; int cpu;
if (nmi_watchdog == NMI_NONE) if (!nmi_watchdog_active() || !atomic_read(&nmi_active))
return 0;
if (!atomic_read(&nmi_active))
return 0; return 0;
prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(int), GFP_KERNEL); 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) void stop_apic_nmi_watchdog(void *unused)
{ {
/* only support LOCAL and IO APICs for now */ /* only support LOCAL and IO APICs for now */
if (nmi_watchdog != NMI_LOCAL_APIC && if (!nmi_watchdog_active())
nmi_watchdog != NMI_IO_APIC)
return; return;
if (__get_cpu_var(wd_enabled) == 0) if (__get_cpu_var(wd_enabled) == 0)
return; return;
@@ -348,8 +344,7 @@ static DEFINE_PER_CPU(int, nmi_touch);
void touch_nmi_watchdog(void) void touch_nmi_watchdog(void)
{ {
if (nmi_watchdog == NMI_LOCAL_APIC || if (nmi_watchdog_active()) {
nmi_watchdog == NMI_IO_APIC) {
unsigned cpu; 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) if (!!old_state == !!nmi_watchdog_enabled)
return 0; return 0;
if (atomic_read(&nmi_active) < 0 || nmi_watchdog == NMI_NONE) { if (atomic_read(&nmi_active) < 0 || !nmi_watchdog_active()) {
printk(KERN_WARNING printk(KERN_WARNING
"NMI watchdog is permanently disabled\n"); "NMI watchdog is permanently disabled\n");
return -EIO; return -EIO;

13
include/asm-x86/nmi.h
View File

@@ -56,6 +56,19 @@ static inline void localise_nmi_watchdog(void)
if (nmi_watchdog == NMI_IO_APIC) if (nmi_watchdog == NMI_IO_APIC)
nmi_watchdog = NMI_LOCAL_APIC; nmi_watchdog = NMI_LOCAL_APIC;
} }
/* check if nmi_watchdog is active (ie was specified at boot) */
static inline int nmi_watchdog_active(void)
{
/*
* actually it should be:
* return (nmi_watchdog == NMI_LOCAL_APIC ||
* nmi_watchdog == NMI_IO_APIC)
* but since they are power of two we could use a
* cheaper way --cvg
*/
return nmi_watchdog & 0x3;
}
#endif #endif
void lapic_watchdog_stop(void); void lapic_watchdog_stop(void);