From be39723beda216f9089b538c23dd2511089c1dac Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Mon, 27 Apr 2009 18:42:48 +0200
Subject: [PATCH] --- yaml --- r: 148879 b: refs/heads/master c:
 2e6f694fde0a7158590e121962ca2e3c06633528 h: refs/heads/master i:   148877:
 c62c62d242ba30822b87a00c59852c91f99795e4   148875:
 4dc3d1ea04cf7ae6e0413589c0b5e9d37de70a33   148871:
 270ee96fb1140680523fb39a639d7d8637fd3e83   148863:
 b17331045770b3bb09955f2fe60cc70aebed9b74 v: v3

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

diff --git a/[refs] b/[refs]
index b3a60be9fdaf..ad7e344bbcb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06b7a7a5ec917761969444fee967c43868a76468
+refs/heads/master: 2e6f694fde0a7158590e121962ca2e3c06633528
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
index 1dcd3be03328..1336280edcc2 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
@@ -650,6 +650,12 @@ static void mce_cpu_quirks(struct cpuinfo_x86 *c)
 			 */
 			mce_bootlog = 0;
 		}
+		/*
+		 * Various K7s with broken bank 0 around. Always disable
+		 * by default.
+		 */
+		 if (c->x86 == 6)
+			bank[0] = 0;
 	}
 
 	if (c->x86_vendor == X86_VENDOR_INTEL) {