From 682956f00b5b26d9864b29fda4f09a544213008e Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Sat, 5 Nov 2005 17:25:53 +0100
Subject: [PATCH] --- yaml --- r: 14191 b: refs/heads/master c:
 f5f786d0455c359c554b8f74783f887c0a2c9fac h: refs/heads/master i:   14189:
 c424d3156bdc927499444fe2b07e3732eba5f4c3   14187:
 ac22150f7c97c89c1b3b1acfc799e8391328ca93   14183:
 ec1b5828d60dd247919d4efaad9d7990f46abbb6   14175:
 157a0715320999123b2fb6c319d97f84c2d884dc v: v3

---
 [refs]                              | 2 +-
 trunk/arch/i386/kernel/cpu/common.c | 4 ++--
 trunk/arch/x86_64/kernel/setup.c    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 14dcd948d675..266eba2cf6e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9b59d834faf0305cb6214a358f65f72c57b9e99
+refs/heads/master: f5f786d0455c359c554b8f74783f887c0a2c9fac
diff --git a/trunk/arch/i386/kernel/cpu/common.c b/trunk/arch/i386/kernel/cpu/common.c
index 74145a33cb0f..35a67dab4a94 100644
--- a/trunk/arch/i386/kernel/cpu/common.c
+++ b/trunk/arch/i386/kernel/cpu/common.c
@@ -233,10 +233,10 @@ static void __init early_cpu_detect(void)
 		cpuid(0x00000001, &tfms, &misc, &junk, &cap0);
 		c->x86 = (tfms >> 8) & 15;
 		c->x86_model = (tfms >> 4) & 15;
-		if (c->x86 == 0xf) {
+		if (c->x86 == 0xf)
 			c->x86 += (tfms >> 20) & 0xff;
+		if (c->x86 >= 0x6)
 			c->x86_model += ((tfms >> 16) & 0xF) << 4;
-		}
 		c->x86_mask = tfms & 15;
 		if (cap0 & (1<<19))
 			c->x86_cache_alignment = ((misc >> 8) & 0xff) * 8;
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index da0bc3e7bdf5..f27731ac95c5 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -1060,10 +1060,10 @@ void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
 		c->x86 = (tfms >> 8) & 0xf;
 		c->x86_model = (tfms >> 4) & 0xf;
 		c->x86_mask = tfms & 0xf;
-		if (c->x86 == 0xf) {
+		if (c->x86 == 0xf)
 			c->x86 += (tfms >> 20) & 0xff;
+		if (c->x86 >= 0x6)
 			c->x86_model += ((tfms >> 16) & 0xF) << 4;
-		} 
 		if (c->x86_capability[0] & (1<<19)) 
 			c->x86_clflush_size = ((misc >> 8) & 0xff) * 8;
 	} else {