x86/cpu: Track legacy CPU model data only on 32-bit kernels

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / cpu / common.c

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 2793d1f095a2d865c23f14449944d322377f3dba..9ada0b37ae07ded220fedc5ad0112f526cf86bc9 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -346,7 +346,8 @@ static void filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
 /* Look up CPU names by table lookup. */
 static const char *table_lookup_model(struct cpuinfo_x86 *c)
 {
-       const struct cpu_model_info *info;
+#ifdef CONFIG_X86_32
+       const struct legacy_cpu_model_info *info;
 
        if (c->x86_model >= 16)
                return NULL;    /* Range check */
@@ -354,13 +355,14 @@ static const char *table_lookup_model(struct cpuinfo_x86 *c)
        if (!this_cpu)
                return NULL;
 
-       info = this_cpu->c_models;
+       info = this_cpu->legacy_models;
 
-       while (info && info->family) {
+       while (info->family) {
                if (info->family == c->x86)
                        return info->model_names[c->x86_model];
                info++;
        }
+#endif
        return NULL;            /* Not found */
 }
 
@@ -450,8 +452,8 @@ void cpu_detect_cache_sizes(struct cpuinfo_x86 *c)
        c->x86_tlbsize += ((ebx >> 16) & 0xfff) + (ebx & 0xfff);
 #else
        /* do processor-specific cache resizing */
-       if (this_cpu->c_size_cache)
-               l2size = this_cpu->c_size_cache(c, l2size);
+       if (this_cpu->legacy_cache_size)
+               l2size = this_cpu->legacy_cache_size(c, l2size);
 
        /* Allow user to override all this if necessary. */
        if (cachesize_override != -1)