From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Sun, 7 Jun 2009 08:19:37 +0000 (+0400)
Subject: x86, nmi: Use predefined numbers instead of hardcoded one
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~11469^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a4046f8d299e00e9855ae292527c2d66a42670eb;p=mirror_ubuntu-zesty-kernel.git

x86, nmi: Use predefined numbers instead of hardcoded one

[ Impact: cleanup ]

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
LKML-Reference: <20090607081937.GC4547@lenovo>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index c45a0a568dff..c97264409934 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