aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorSuresh Siddha <suresh.b.siddha@intel.com>2005-11-05 11:25:53 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-14 22:55:14 -0500
commitf5f786d0455c359c554b8f74783f887c0a2c9fac (patch)
tree2d8bf241afe4d9242657f29f6494ce8763b3418d /arch/i386
parente9b59d834faf0305cb6214a358f65f72c57b9e99 (diff)
[PATCH] x86-64/i386: Fix CPU model for family 6
According to cpuid instruction in IA32 SDM-Vol2, when computing cpu model, we need to consider extended model ID for family 0x6 also. AK: Also added fixes/simplifcation from Petr Vandrovec Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/cpu/common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index 74145a33cb0f..35a67dab4a94 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -233,10 +233,10 @@ static void __init early_cpu_detect(void)
233 cpuid(0x00000001, &tfms, &misc, &junk, &cap0); 233 cpuid(0x00000001, &tfms, &misc, &junk, &cap0);
234 c->x86 = (tfms >> 8) & 15; 234 c->x86 = (tfms >> 8) & 15;
235 c->x86_model = (tfms >> 4) & 15; 235 c->x86_model = (tfms >> 4) & 15;
236 if (c->x86 == 0xf) { 236 if (c->x86 == 0xf)
237 c->x86 += (tfms >> 20) & 0xff; 237 c->x86 += (tfms >> 20) & 0xff;
238 if (c->x86 >= 0x6)
238 c->x86_model += ((tfms >> 16) & 0xF) << 4; 239 c->x86_model += ((tfms >> 16) & 0xF) << 4;
239 }
240 c->x86_mask = tfms & 15; 240 c->x86_mask = tfms & 15;
241 if (cap0 & (1<<19)) 241 if (cap0 & (1<<19))
242 c->x86_cache_alignment = ((misc >> 8) & 0xff) * 8; 242 c->x86_cache_alignment = ((misc >> 8) & 0xff) * 8;