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

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

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index ec7299566f797b1d77a05b0c6be01178d9677e17..dc1ec0dff939ecff5e55bcccaeb5bea322ad982a 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -665,8 +665,8 @@ static const struct cpu_dev intel_cpu_dev = {
        .c_vendor       = "Intel",
        .c_ident        = { "GenuineIntel" },
 #ifdef CONFIG_X86_32
-       .c_models = {
-               { .vendor = X86_VENDOR_INTEL, .family = 4, .model_names =
+       .legacy_models = {
+               { .family = 4, .model_names =
                  {
                          [0] = "486 DX-25/33",
                          [1] = "486 DX-50",
@@ -679,7 +679,7 @@ static const struct cpu_dev intel_cpu_dev = {
                          [9] = "486 DX/4-WB"
                  }
                },
-               { .vendor = X86_VENDOR_INTEL, .family = 5, .model_names =
+               { .family = 5, .model_names =
                  {
                          [0] = "Pentium 60/66 A-step",
                          [1] = "Pentium 60/66",
@@ -690,7 +690,7 @@ static const struct cpu_dev intel_cpu_dev = {
                          [8] = "Mobile Pentium MMX"
                  }
                },
-               { .vendor = X86_VENDOR_INTEL, .family = 6, .model_names =
+               { .family = 6, .model_names =
                  {
                          [0] = "Pentium Pro A-step",
                          [1] = "Pentium Pro",
@@ -704,7 +704,7 @@ static const struct cpu_dev intel_cpu_dev = {
                          [11] = "Pentium III (Tualatin)",
                  }
                },
-               { .vendor = X86_VENDOR_INTEL, .family = 15, .model_names =
+               { .family = 15, .model_names =
                  {
                          [0] = "Pentium 4 (Unknown)",
                          [1] = "Pentium 4 (Willamette)",
@@ -714,7 +714,7 @@ static const struct cpu_dev intel_cpu_dev = {
                  }
                },
        },
-       .c_size_cache   = intel_size_cache,
+       .legacy_cache_size = intel_size_cache,
 #endif
        .c_detect_tlb   = intel_detect_tlb,
        .c_early_init   = early_init_intel,