Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cpu changes from Ingo Molnar:
 "The biggest change that stands out is the increase of the
  CONFIG_NR_CPUS range from 4096 to 8192 - as real hardware out there
  already went beyond 4k CPUs ...

  We only allow more than 512 CPUs if offstack cpumasks are enabled.

  CONFIG_MAXSMP=y remains to be the 'you are nuts!' extreme testcase,
  which now means a max of 8192 CPUs"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Increase max CPU count to 8192
  x86/cpu: Allow higher NR_CPUS values
  x86/cpu: Always print SMP information in /proc/cpuinfo
  x86/cpu: Track legacy CPU model data only on 32-bit kernels

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index ec7299566f79..dc1ec0dff939 100644
--- 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,