(Note: Patch also attached because the inline version is certain to get line wrapped.) Don't call nmi_watchdog_tick() when this isn't enabled. Signed-off-by: Jan Beulich <[email protected]> diff -Npru 2.6.13/arch/i386/kernel/traps.c 2.6.13-i386-watchdog-active/arch/i386/kernel/traps.c --- 2.6.13/arch/i386/kernel/traps.c 2005-08-29 01:41:01.000000000 +0200 +++ 2.6.13-i386-watchdog-active/arch/i386/kernel/traps.c 2005-09-01 14:04:35.000000000 +0200 @@ -611,7 +611,7 @@ static void default_do_nmi(struct pt_reg * Ok, so this is none of the documented NMI sources, * so it must be the NMI watchdog. */ - if (nmi_watchdog) { + if (nmi_watchdog && nmi_active > 0) { nmi_watchdog_tick(regs); return; } diff -Npru 2.6.13/include/asm-i386/apic.h 2.6.13-i386-watchdog-active/include/asm-i386/apic.h --- 2.6.13/include/asm-i386/apic.h 2005-08-29 01:41:01.000000000 +0200 +++ 2.6.13-i386-watchdog-active/include/asm-i386/apic.h 2005-09-01 11:32:11.000000000 +0200 @@ -125,6 +125,7 @@ extern void enable_APIC_timer(void); extern void enable_NMI_through_LVT0 (void * dummy); extern unsigned int nmi_watchdog; +extern int nmi_active; #define NMI_NONE 0 #define NMI_IO_APIC 1 #define NMI_LOCAL_APIC 2
Attachment:
linux-2.6.13-i386-watchdog-active.patch
Description: Binary data
- Follow-Ups:
- Re: [PATCH] fix i386 condition to call nmi_watchdog_tick
- From: Zwane Mwaikambo <[email protected]>
- Re: [PATCH] fix i386 condition to call nmi_watchdog_tick
- Prev by Date: [PATCH] introduce THREAD_ORDER to i386
- Next by Date: Re: [PATCH] add stricmp
- Previous by thread: [PATCH] introduce THREAD_ORDER to i386
- Next by thread: Re: [PATCH] fix i386 condition to call nmi_watchdog_tick
- Index(es):
