diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 05:46:43 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 05:46:43 +0400 |
| commit | 6df1e7f2e96721dfdbfd8a034e52bc81916f978c (patch) | |
| tree | 8567e8dd37a2ebdc5f7670c88e82f2e9d9e725be /Documentation/x86/boot.txt | |
| parent | d96d8aa261708ecb1536d2733081800e7e15e8f4 (diff) | |
| parent | b53b5eda8194214928c8243d711a75dbf51809fc (diff) | |
| download | linux-6df1e7f2e96721dfdbfd8a034e52bc81916f978c.tar.xz | |
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
Diffstat (limited to 'Documentation/x86/boot.txt')
0 files changed, 0 insertions, 0 deletions