summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-11-01 10:01:08 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-11-01 10:01:08 -0400
commitde05667da75d42dc3945edce80391cc7b88f6c01 (patch)
treefef0e8dfa1aaf3d78346c5540e8bf768860bc4a8
parent69fef575e3fbb5ee6952a4f4868e31e368c4a248 (diff)
downloadkernel-de05667da75d42dc3945edce80391cc7b88f6c01.tar.gz
kernel-de05667da75d42dc3945edce80391cc7b88f6c01.tar.xz
kernel-de05667da75d42dc3945edce80391cc7b88f6c01.zip
Add patch to allow NR_CPUS=1024 on x86_64
The way the kconfig is structured, you either have a range from 2-512 CPUs if SMP is set and MAXSMP is not set, or you get the default value of 4096 as soon as you set MAXSMP. Increase the range to 1024 in the !MAXSMP case.
-rw-r--r--kernel.spec3
-rw-r--r--x86-allow-1024-cpus.patch13
2 files changed, 16 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 483fd8835..1ca44cae4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -625,6 +625,8 @@ Patch470: die-floppy-die.patch
Patch510: silence-noise.patch
Patch530: silence-fbcon-logo.patch
+Patch600: x86-allow-1024-cpus.patch
+
Patch800: crash-driver.patch
# crypto/
@@ -1278,6 +1280,7 @@ ApplyOptionalPatch upstream-reverts.patch -R
# Architecture patches
# x86(-64)
+ApplyPatch x86-allow-1024-cpus.patch
# ARM64
diff --git a/x86-allow-1024-cpus.patch b/x86-allow-1024-cpus.patch
new file mode 100644
index 000000000..decafd6ef
--- /dev/null
+++ b/x86-allow-1024-cpus.patch
@@ -0,0 +1,13 @@
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index f67e839..d726b2d 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -825,7 +825,7 @@ 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 1024 if SMP && !MAXSMP
+ default "1" if !SMP
+ default "4096" if MAXSMP
+ default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000)