diff options
| author | Borislav Petkov <bp@suse.de> | 2014-01-15 12:52:15 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-01-15 04:21:45 -0800 |
| commit | d139336700a5f3a560da235e4dfcd286773025d4 (patch) | |
| tree | fb23c22a66850dcf546f557bb1f1d09263424cf6 /arch/x86/kernel/cpu | |
| parent | 106553aa4ead528b1bab37fb3cc47004a4451acc (diff) | |
| download | linux-stable-d139336700a5f3a560da235e4dfcd286773025d4.tar.gz linux-stable-d139336700a5f3a560da235e4dfcd286773025d4.tar.bz2 linux-stable-d139336700a5f3a560da235e4dfcd286773025d4.zip | |
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: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1389786735-16751-1-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 39bc78dad377..e5647ab5fc23 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -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; |