x86: touch_nmi_watchdog - reset alert counters for supported nmi_watchdog modes only
PATCH 1/1 x86: touch_nmi_watchdog - reset alert counters for supported nmi_watchdog modes only
The checking 'if nmi_watchdog > 0' (ie NMI_NONE) is quite fast but it has a side effect - it's taken even if nmi_watchdog = NMI_DISABLED.
Nowadays nmi_watchdog is set up to NMI_NONE by default so this condition is properly taken most the time but we better show this explicitly.
---
The patch is over tip/master
commit 169f18cf265d4107ec8227f278afa0bb7f6f3dc3 Author: Ingo Molnar <[email protected]> Date: Tue Jun 10 16:38:41 2008 +0200 x86: unify the reserve_bootmem() behavior of early_res_to_bootmem()
Please, review. Any comments are welcome.
arch/x86/kernel/nmi.c +2 -1
@@ -355,7 +355,8 @@ static DEFINE_PER_CPU(int, nmi_touch);void touch_nmi_watchdog (void ) { -if (nmi_watchdog >0 ) { +if (nmi_watchdog ==NMI_LOCAL_APIC || + nmi_watchdog ==NMI_IO_APIC ) {unsigned cpu;/*
Ingo Molnar
AppliedQuoted 6 lines · Cyrill Gorcunov
The checking 'if
nmi_watchdog> 0' (ieNMI_NONE) is quite fast but it has a side effect - it's taken even ifnmi_watchdog=NMI_DISABLED.Nowadays
nmi_watchdogis set up toNMI_NONEby default so this condition is properly taken most the time but we better show this explicitly.
applied to tip/x86/nmi - thanks Cyrill.
Ingo