public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86: IO-APIC - use NMI_NONE instead of numeric constant
@ 2008-05-29 18:32 Cyrill Gorcunov
  2008-06-02  9:24 ` Ingo Molnar
  0 siblings, 1 reply; 2+ messages in thread
From: Cyrill Gorcunov @ 2008-05-29 18:32 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: Maciej W. Rozycki, LKML

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---

Not sure but maybe it is better to use NMI_DISABLED,
will take a look. But for now this patch is not change
anything in logic so it will not hurt/broke the kernel.
For most cases nmi_watchdog assignment is by one of NMI_*
macro so I think there it make sense too.

Index: linux-2.6.git/arch/x86/kernel/io_apic_32.c
====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/io_apic_32.c	2008-05-24 11:28:40.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/io_apic_32.c	2008-05-29 22:22:25.000000000 +0400
@@ -2217,7 +2217,7 @@ static inline void __init check_timer(vo
 
 	if (nmi_watchdog == NMI_IO_APIC) {
 		printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
-		nmi_watchdog = 0;
+		nmi_watchdog = NMI_NONE;
 	}
 
 	printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");
Index: linux-2.6.git/arch/x86/kernel/io_apic_64.c
====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/io_apic_64.c	2008-05-24 11:28:40.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/io_apic_64.c	2008-05-29 22:23:04.000000000 +0400
@@ -1735,7 +1735,7 @@ static inline void __init check_timer(vo
 
 	if (nmi_watchdog == NMI_IO_APIC) {
 		printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
-		nmi_watchdog = 0;
+		nmi_watchdog = NMI_NONE;
 	}
 
 	apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] x86: IO-APIC - use NMI_NONE instead of numeric constant
  2008-05-29 18:32 [PATCH] x86: IO-APIC - use NMI_NONE instead of numeric constant Cyrill Gorcunov
@ 2008-06-02  9:24 ` Ingo Molnar
  0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-06-02  9:24 UTC (permalink / raw)
  To: Cyrill Gorcunov
  Cc: Thomas Gleixner, H. Peter Anvin, Maciej W. Rozycki, LKML, x86


* Cyrill Gorcunov <gorcunov@gmail.com> wrote:

> Not sure but maybe it is better to use NMI_DISABLED, will take a look. 
> But for now this patch is not change anything in logic so it will not 
> hurt/broke the kernel. For most cases nmi_watchdog assignment is by 
> one of NMI_* macro so I think there it make sense too.

applied to -tip, thanks Cyrill.

	Ingo

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-06-02  9:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-29 18:32 [PATCH] x86: IO-APIC - use NMI_NONE instead of numeric constant Cyrill Gorcunov
2008-06-02  9:24 ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox