* [PATCH] x86: touch_nmi_watchdog - reset alert counters for supported nmi_watchdog modes only
@ 2008-06-12 13:08 Cyrill Gorcunov
2008-06-12 13:15 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Cyrill Gorcunov @ 2008-06-12 13:08 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Maciej W. Rozycki; +Cc: LKML
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.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
The patch is over tip/master
commit 169f18cf265d4107ec8227f278afa0bb7f6f3dc3
Author: Ingo Molnar <mingo@elte.hu>
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.
Index: linux-2.6.git/arch/x86/kernel/nmi.c
====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/nmi.c 2008-06-12 12:27:04.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/nmi.c 2008-06-12 16:53:26.000000000 +0400
@@ -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;
/*
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] x86: touch_nmi_watchdog - reset alert counters for supported nmi_watchdog modes only
2008-06-12 13:08 [PATCH] x86: touch_nmi_watchdog - reset alert counters for supported nmi_watchdog modes only Cyrill Gorcunov
@ 2008-06-12 13:15 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-06-12 13:15 UTC (permalink / raw)
To: Cyrill Gorcunov; +Cc: Thomas Gleixner, H. Peter Anvin, Maciej W. Rozycki, LKML
* Cyrill Gorcunov <gorcunov@gmail.com> wrote:
> 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.
applied to tip/x86/nmi - thanks Cyrill.
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-06-12 13:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-12 13:08 [PATCH] x86: touch_nmi_watchdog - reset alert counters for supported nmi_watchdog modes only Cyrill Gorcunov
2008-06-12 13:15 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®