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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2013-11-12 10:46:43 +09:00

parent d96d8aa261 b53b5eda81

commit 6df1e7f2e9

8 changed files with 45 additions and 40 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

arch/x86/Kconfig

View file

6

arch/x86/kernel/cpu/amd.c

View file

8

arch/x86/kernel/cpu/centaur.c

View file

12

arch/x86/kernel/cpu/common.c

View file

20

arch/x86/kernel/cpu/cpu.h

View file

12

arch/x86/kernel/cpu/intel.c

View file

15

arch/x86/kernel/cpu/proc.c

View file

4

arch/x86/kernel/cpu/umc.c

View file