[PATCH]cpu model calculation for family 6 cpu

[Shaohua Li <shaohua.li@intel.com>]

The x86_model calculation also applies for family 6. early_cpu_detect
does the right thing, but generic_identify misses.

Signed-off-by: Shaohua Li<shaohua.li@intel.com>
---

 linux-2.6.16-rc5-root/arch/i386/kernel/cpu/common.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/cpu/common.c~cpu_model arch/i386/kernel/cpu/common.c
--- linux-2.6.16-rc5/arch/i386/kernel/cpu/common.c~cpu_model	2006-03-02 09:47:21.000000000 +0800
+++ linux-2.6.16-rc5-root/arch/i386/kernel/cpu/common.c	2006-03-02 09:53:01.000000000 +0800
@@ -278,10 +278,10 @@ void __devinit generic_identify(struct c
 			c->x86_capability[4] = excap;
 			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;
 		} else {
 			/* Have CPUID level 0 only - unheard of */
_


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/