Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

[~andy/linux] / arch / x86 / kernel / cpu / intel.c

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 0a4ce2980a5a33e90bea05599a015a0c1381bf23..198e019a531af8f26c9c094560d87b325998428b 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/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;