Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed2da193 authored by Shaohua Li's avatar Shaohua Li Committed by Linus Torvalds
Browse files

[PATCH] x86: cpu model calculation for family 6 cpu 



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

Signed-off-by: default avatarShaohua <Li&lt;shaohua.li@intel.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: "Seth, Rohit" <rohit.seth@intel.com>
Acked-by: default avatarAndi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 90f0094d

arch/i386/kernel/cpu/common.c

+2 −2
Original line number Diff line number Diff line
@@ -278,10 +278,10 @@ void __devinit generic_identify(struct cpuinfo_x86 * 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 */