Commit 95bfb352 authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD) Committed by Ingo Molnar
Browse files

x86/cpu: Get rid of an unnecessary local variable in get_cpu_address_sizes() 



Drop 'vp_bits_from_cpuid' as it is not really needed.

No functional changes.

Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240316120706.4352-1-bp@alien8.de
parent edf66a3c

arch/x86/kernel/cpu/common.c

+7 −10
Original line number Diff line number Diff line
@@ -1053,18 +1053,9 @@ void get_cpu_cap(struct cpuinfo_x86 *c) 
void get_cpu_address_sizes(struct cpuinfo_x86 *c)

{

	u32 eax, ebx, ecx, edx;

	bool vp_bits_from_cpuid = true;



	if (!cpu_has(c, X86_FEATURE_CPUID) ||

	    (c->extended_cpuid_level < 0x80000008))

		vp_bits_from_cpuid = false;



	if (vp_bits_from_cpuid) {

		cpuid(0x80000008, &eax, &ebx, &ecx, &edx);



		c->x86_virt_bits = (eax >> 8) & 0xff;

		c->x86_phys_bits = eax & 0xff;

	} else {

	    (c->extended_cpuid_level < 0x80000008)) {

		if (IS_ENABLED(CONFIG_X86_64)) {

			c->x86_clflush_size = 64;

			c->x86_phys_bits = 36;
@@ -1078,7 +1069,13 @@ void get_cpu_address_sizes(struct cpuinfo_x86 *c) 
			    cpu_has(c, X86_FEATURE_PSE36))

				c->x86_phys_bits = 36;

		}

	} else {

		cpuid(0x80000008, &eax, &ebx, &ecx, &edx);



		c->x86_virt_bits = (eax >> 8) & 0xff;

		c->x86_phys_bits = eax & 0xff;

	}



	c->x86_cache_bits = c->x86_phys_bits;

	c->x86_cache_alignment = c->x86_clflush_size;

}