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, 5 insertions, 3 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5cd6eea9b7b3..e6dde05e7eb0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -826,14 +826,16 @@ config MAXSMP
 config NR_CPUS
         int "Maximum number of CPUs" if SMP && !MAXSMP
         range 2 8 if SMP && X86_32 && !X86_BIGSMP
-        range 2 512 if SMP && !MAXSMP
+        range 2 512 if SMP && !MAXSMP && !CPUMASK_OFFSTACK
+        range 2 8192 if SMP && !MAXSMP && CPUMASK_OFFSTACK && X86_64
         default "1" if !SMP
-        default "4096" if MAXSMP
+        default "8192" if MAXSMP
         default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000)
         default "8" if SMP
         ---help---
           This allows you to specify the maximum number of CPUs which this
-          kernel will support.  The maximum supported value is 512 and the
+          kernel will support.  If CPUMASK_OFFSTACK is enabled, the maximum
+          supported value is 4096, otherwise the maximum value is 512.  The
           minimum value which makes sense is 2.
 
           This is purely to save memory - each supported CPU adds