From: Dave Jones Date: Thu, 22 May 2008 22:55:06 +0000 (-0400) Subject: x86: Remove workaround for prescott (32bit P4) from 64-bit code. X-Git-Tag: v2.6.27-rc1~1106^2~251^8~19 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7e2191127eb414d7d5a11df6552ab6e3845d17a1;p=linux-2.6-omap-h63xx.git x86: Remove workaround for prescott (32bit P4) from 64-bit code. Signed-off-by: Dave Jones Signed-off-by: H. Peter Anvin --- diff --git a/arch/x86/kernel/cpu/intel_64.c b/arch/x86/kernel/cpu/intel_64.c index e5f929f6c3d..b3391219948 100644 --- a/arch/x86/kernel/cpu/intel_64.c +++ b/arch/x86/kernel/cpu/intel_64.c @@ -79,11 +79,6 @@ void __cpuinit init_intel(struct cpuinfo_x86 *c) unsigned eax = cpuid_eax(0x80000008); c->x86_virt_bits = (eax >> 8) & 0xff; c->x86_phys_bits = eax & 0xff; - /* CPUID workaround for Intel 0F34 CPU */ - if (c->x86_vendor == X86_VENDOR_INTEL && - c->x86 == 0xF && c->x86_model == 0x3 && - c->x86_mask == 0x4) - c->x86_phys_bits = 36; } if (c->x86 == 15)