x86, cacheinfo: Determine number of cache leafs using CPUID 0x8000001d on AMD

CPUID 0x8000001d works quite similar to Intels' CPUID function 4.
Use it to determine number of cache leafs.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Link: http://lkml.kernel.org/r/20121019085933.GE26718@alberich
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 1 insertions, 6 deletions

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 64e9ad4e49a0..a8538e6d2ff2 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -643,12 +643,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
         detect_ht(c);
 #endif
 
-        if (c->extended_cpuid_level >= 0x80000006) {
-                if (cpuid_edx(0x80000006) & 0xf000)
-                        num_cache_leaves = 4;
-                else
-                        num_cache_leaves = 3;
-        }
+        init_amd_cacheinfo(c);
 
         if (c->x86 >= 0xf)
                 set_cpu_cap(c, X86_FEATURE_K8);