From 231ab0f06b54529a9a764348908ad677078c5741 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Tue, 22 May 2012 12:53:46 +0200
Subject: [PATCH] --- yaml --- r: 309575 b: refs/heads/master c:
 80f033610fb968e75f5d470233d8d0260d7a72ed h: refs/heads/master i:   309573:
 e0392b2e35b7f6a49a66a4f1a731592c886350b7   309571:
 9fa2543ad237a0c7123ef4d2279626c57447f373   309567:
 e4aa083bf0dc23269bd0224a824b107aa345e57e v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cf18c975b831..1efb87850298 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8f380e00840f694599e6ab42806639f7de26f11
+refs/heads/master: 80f033610fb968e75f5d470233d8d0260d7a72ed
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
index 888fbf9d0adf..0456b9a08086 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1450,9 +1450,9 @@ static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
 				 rdmsrl(msrs[i], val);
 
 				 /* CntP bit set? */
-				 if (val & BIT(62)) {
-					 val &= ~BIT(62);
-					 wrmsrl(msrs[i], val);
+				 if (val & BIT_64(62)) {
+					val &= ~BIT_64(62);
+					wrmsrl(msrs[i], val);
 				 }
 			 }