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

[tip-bot for Cyrill Gorcunov]

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

x86, nmi: Use predefined numbers instead of hardcoded one

[ Impact: cleanup ]

Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
LKML-Reference: <20090607081937.GC4547@lenovo>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
 arch/x86/include/asm/nmi.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index c45a0a5..c972644 100644
--- a/arch/x86/include/asm/nmi.h
+++ b/arch/x86/include/asm/nmi.h
@@ -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
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/