From a3e2cea034b6732a411d155a72f469a801c7f151 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Mon, 6 Aug 2012 19:00:37 +0200 Subject: [PATCH] --- yaml --- r: 324021 b: refs/heads/master c: 5b556332c3ab19e6375836d35ca658776e9ba0f6 h: refs/heads/master i: 324019: 8095acbc5d28282eca2743c1d1e5c620c402b4e6 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/common.c | 3 +-- trunk/arch/x86/kernel/cpu/intel.c | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 62d8efc83a3a..0eb3d9742aa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9ad773e0dd833651f0831020a0ea0265c29f2ea +refs/heads/master: 5b556332c3ab19e6375836d35ca658776e9ba0f6 diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c index d239977f361f..080f4a737e3e 100644 --- a/trunk/arch/x86/kernel/cpu/common.c +++ b/trunk/arch/x86/kernel/cpu/common.c @@ -940,8 +940,7 @@ void __init identify_boot_cpu(void) #else vgetcpu_set_mode(); #endif - if (boot_cpu_data.cpuid_level >= 2) - cpu_detect_tlb(&boot_cpu_data); + cpu_detect_tlb(&boot_cpu_data); } void __cpuinit identify_secondary_cpu(struct cpuinfo_x86 *c) diff --git a/trunk/arch/x86/kernel/cpu/intel.c b/trunk/arch/x86/kernel/cpu/intel.c index 0a4ce2980a5a..198e019a531a 100644 --- a/trunk/arch/x86/kernel/cpu/intel.c +++ b/trunk/arch/x86/kernel/cpu/intel.c @@ -648,6 +648,10 @@ static void __cpuinit intel_detect_tlb(struct cpuinfo_x86 *c) int i, j, n; unsigned int regs[4]; unsigned char *desc = (unsigned char *)regs; + + if (c->cpuid_level < 2) + return; + /* Number of times to iterate */ n = cpuid_eax(2) & 0xFF;