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

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

x86, cpu, amd: Fix a shadowed variable situation 



Having u32 and struct cpuinfo_x86 * by the same name is not very smart,
although it was ok in this case due to the limited scope of u32 c and it
being used only once in there.

Fix this.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1389786735-16751-1-git-send-email-bp@alien8.de


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 106553aa

arch/x86/kernel/cpu/amd.c

+3 −7
Original line number Diff line number Diff line
@@ -789,14 +789,10 @@ static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c) 
	}



	/* Handle DTLB 2M and 4M sizes, fall back to L1 if L2 is disabled */

	if (!((eax >> 16) & mask)) {

		u32 a, b, c, d;



		cpuid(0x80000005, &a, &b, &c, &d);

		tlb_lld_2m[ENTRIES] = (a >> 16) & 0xff;

	} else {

	if (!((eax >> 16) & mask))

		tlb_lld_2m[ENTRIES] = (cpuid_eax(0x80000005) >> 16) & 0xff;

	else

		tlb_lld_2m[ENTRIES] = (eax >> 16) & mask;

	}



	/* a 4M entry uses two 2M entries */

	tlb_lld_4m[ENTRIES] = tlb_lld_2m[ENTRIES] >> 1;