From d4e78d3b97c42f5700887bd9b11caeab40ed28a8 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 12 Oct 2011 17:46:34 -0700 Subject: [PATCH] --- yaml --- r: 269535 b: refs/heads/master c: 30963c0ac721f70aea0352ed1cd0fc3cfbaef730 h: refs/heads/master i: 269533: b0477cfebcab51302f5f273d8b1e2586b1c5b68e 269531: 856936272f20543a8f4e4e27a696aa0c83a421af 269527: 8754f82e988707dde0f7e1411906f2fa89edf00d 269519: f09d74cb9cd79b9b846a296ab4085730d07b9dff 269503: 0bf35c5b0aa0eb334dbf505f44a99feadc86dbb0 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/intel.c | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 0e6cae1e3422..15a95738ddc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 506ed6b53e00ba303ad778122f08e1fca7cf5efb +refs/heads/master: 30963c0ac721f70aea0352ed1cd0fc3cfbaef730 diff --git a/trunk/arch/x86/kernel/cpu/intel.c b/trunk/arch/x86/kernel/cpu/intel.c index 26627a3a7148..523131213f08 100644 --- a/trunk/arch/x86/kernel/cpu/intel.c +++ b/trunk/arch/x86/kernel/cpu/intel.c @@ -64,17 +64,10 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) * need the microcode to have already been loaded... so if it is * not, recommend a BIOS update and disable large pages. */ - if (c->x86 == 6 && c->x86_model == 0x1c && c->x86_mask <= 2) { - u32 ucode, junk; - - wrmsr(MSR_IA32_UCODE_REV, 0, 0); - sync_core(); - rdmsr(MSR_IA32_UCODE_REV, junk, ucode); - - if (ucode < 0x20e) { - printk(KERN_WARNING "Atom PSE erratum detected, BIOS microcode update recommended\n"); - clear_cpu_cap(c, X86_FEATURE_PSE); - } + if (c->x86 == 6 && c->x86_model == 0x1c && c->x86_mask <= 2 && + c->microcode < 0x20e) { + printk(KERN_WARNING "Atom PSE erratum detected, BIOS microcode update recommended\n"); + clear_cpu_cap(c, X86_FEATURE_PSE); } #ifdef CONFIG_X86_64