diff --git a/[refs] b/[refs] index 9bb170b0a1fb..72a7d1dd2ce5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a82fbe31cb387bb246e2d3b3c177f551bb991135 +refs/heads/master: 7e2191127eb414d7d5a11df6552ab6e3845d17a1 diff --git a/trunk/arch/x86/kernel/cpu/intel_64.c b/trunk/arch/x86/kernel/cpu/intel_64.c index e5f929f6c3d4..b33912199484 100644 --- a/trunk/arch/x86/kernel/cpu/intel_64.c +++ b/trunk/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)