Skip to contentSkip to conversation

nmi: use predefined numbers instead of hardcoded one

PATCH In review Cyrill Gorcunov 1 participant 2 messages Jun 7, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nmi: use predefined numbers instead of hardcoded one

---
I should have it done long time ago but anyway.

 arch/x86/include/asm/nmi.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/nmi.h +1 -1
Index: linux-2.6.git/arch/x86/include/asm/nmi.h
=====================================================================
@@ -64,7 +64,7 @@ static inline int nmi_watchdog_active(vo
 	 * but since they are power of two we could use a
 	 * cheaper way --cvg
 	 */
-	return nmi_watchdog & 0x3;
+	return nmi_watchdog & (NMI_LOCAL_APIC | NMI_IO_APIC);
 }
 #endif
 
#1 lore raw

[tip:x86/cleanups] x86, nmi: Use predefined numbers instead of hardcoded one

Commit-ID:  a4046f8d299e00e9855ae292527c2d66a42670eb
Gitweb:     http://git.kernel.org/tip/a4046f8d299e00e9855ae292527c2d66a42670eb
Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Sun, 7 Jun 2009 12:19:37 +0400
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 7 Jun 2009 16:22:02 +0200

x86, nmi: Use predefined numbers instead of hardcoded one

[ Impact: cleanup ]

LKML-Reference: <20090607081937.GC4547@lenovo>

---
 arch/x86/include/asm/nmi.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/include/asm/nmi.h +1 -1
index c45a0a5..c972644 100644
@@ -64,7 +64,7 @@ static inline int nmi_watchdog_active(void)
 	 * but since they are power of two we could use a
 	 * cheaper way --cvg
 	 */
-	return nmi_watchdog & 0x3;
+	return nmi_watchdog & (NMI_LOCAL_APIC | NMI_IO_APIC);
 }
 #endif