x86, AMD: Remove needless CPU family check (for L3 cache info)
authorAndreas Herrmann <andreas.herrmann3@amd.com>
Thu, 2 Sep 2010 13:37:10 +0000 (15:37 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 5 Sep 2010 12:33:48 +0000 (14:33 +0200)
Old 32-bit AMD CPUs (all w/o L3 cache) should always return 0
for cpuid_edx(0x80000006).

For unknown reason the 32-bit implementation differed from the
64-bit implementation. See commit 67cddd94799 ("i386: Add L3 cache
support to AMD CPUID4 emulation"). The current check is the
result of the x86 merge.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Andi Kleen <andi@firstfloor.org>
LKML-Reference: <20100902133710.GA5449@loge.amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/amd.c

index fc563fabde6731d0dded6ffe6532fedfbb539174..0f0ace5d7db5e1b962bc008a001e92e9d6bc02cc 100644 (file)
@@ -540,7 +540,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 #endif
 
        if (c->extended_cpuid_level >= 0x80000006) {
-               if ((c->x86 >= 0x0f) && (cpuid_edx(0x80000006) & 0xf000))
+               if (cpuid_edx(0x80000006) & 0xf000)
                        num_cache_leaves = 4;
                else
                        num_cache_leaves = 3;