From 7cb2cda0d218912f506a86dd95fda28747a7ba8b Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Fri, 1 Oct 2010 19:44:53 +0200
Subject: [PATCH] --- yaml --- r: 227293 b: refs/heads/master c:
 9f56da0e3c3269abe0b2745a54f1b082c3c14433 h: refs/heads/master i:   227291:
 886eeffe7cd86fd324c983b5d35b630da6a2f12e v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/edac/amd64_edac.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 70a942aa1046..8e882bd2e435 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ab0e7dc2e1d5598da609ec9a9bcd3b69b8fa654
+refs/heads/master: 9f56da0e3c3269abe0b2745a54f1b082c3c14433
diff --git a/trunk/drivers/edac/amd64_edac.c b/trunk/drivers/edac/amd64_edac.c
index 7e539ac769d7..0cbcf6e34a4c 100644
--- a/trunk/drivers/edac/amd64_edac.c
+++ b/trunk/drivers/edac/amd64_edac.c
@@ -1046,13 +1046,12 @@ static int k8_early_channel_count(struct amd64_pvt *pvt)
 	if (err)
 		return err;
 
-	if ((boot_cpu_data.x86_model >> 4) >= K8_REV_F) {
+	if (pvt->ext_model >= K8_REV_F)
 		/* RevF (NPT) and later */
 		flag = pvt->dclr0 & F10_WIDTH_128;
-	} else {
+	else
 		/* RevE and earlier */
 		flag = pvt->dclr0 & REVE_WIDTH_128;
-	}
 
 	/* not used */
 	pvt->dclr1 = 0;