Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b556332 authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86, cpu: Push TLB detection CPUID check down 



Push the max CPUID leaf check into the ->detect_tlb function and remove
general test case from the generic path.

Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Link: http://lkml.kernel.org/r/1344272439-29080-3-git-send-email-bp@amd64.org


Acked-by: default avatarAlex Shi <alex.shi@intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent a9ad773e

arch/x86/kernel/cpu/common.c

+1 −2
Original line number Diff line number Diff line
@@ -940,7 +940,6 @@ void __init identify_boot_cpu(void) 
#else

	vgetcpu_set_mode();

#endif

	if (boot_cpu_data.cpuid_level >= 2)

	cpu_detect_tlb(&boot_cpu_data);

}

arch/x86/kernel/cpu/intel.c

+4 −0
Original line number Diff line number Diff line
@@ -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;