From fb1510762d34b1a45c20ad6c00304e1e400c9d42 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Sun, 7 Jun 2009 12:19:37 +0400
Subject: [PATCH] --- yaml --- r: 145743 b: refs/heads/master c:
 a4046f8d299e00e9855ae292527c2d66a42670eb h: refs/heads/master i:   145741:
 fae0a227e7e3483eddc352e5ff8d3e54e6c6b341   145739:
 19472c838f4ec4564797e11b846de8f69036c9c7   145735:
 c8858e8e66799dc15a2267339b03d06a70bc4d29   145727:
 b8ecd7a6005c5c3b5c43976b4096ddb9aebaeabc v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/include/asm/nmi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 71f1c85c9be0..5d84c90c4fd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aee2ad461889132bfb5a1518a9580d00e17008c
+refs/heads/master: a4046f8d299e00e9855ae292527c2d66a42670eb
diff --git a/trunk/arch/x86/include/asm/nmi.h b/trunk/arch/x86/include/asm/nmi.h
index c45a0a568dff..c97264409934 100644
--- a/trunk/arch/x86/include/asm/nmi.h
+++ b/trunk/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