diff options
| -rw-r--r-- | configs/fedora/generic/x86/CONFIG_MAXSMP | 2 | ||||
| -rw-r--r-- | configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS | 2 | ||||
| -rw-r--r-- | kernel-i686.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 4 | ||||
| -rw-r--r-- | kernel.spec | 2 | ||||
| -rw-r--r-- | lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch | 34 |
6 files changed, 5 insertions, 41 deletions
diff --git a/configs/fedora/generic/x86/CONFIG_MAXSMP b/configs/fedora/generic/x86/CONFIG_MAXSMP index d0d71de53..8d0fa581d 100644 --- a/configs/fedora/generic/x86/CONFIG_MAXSMP +++ b/configs/fedora/generic/x86/CONFIG_MAXSMP @@ -1 +1 @@ -# CONFIG_MAXSMP is not set +CONFIG_MAXSMP=y diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS b/configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS index 27d187f4d..441191641 100644 --- a/configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS +++ b/configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS @@ -1 +1 @@ -CONFIG_NR_CPUS=1024 +CONFIG_NR_CPUS=8192 diff --git a/kernel-i686.config b/kernel-i686.config index 599d02836..fb4beba86 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2915,7 +2915,7 @@ CONFIG_MAX44009=m # CONFIG_MAX9611 is not set CONFIG_MAXIM_THERMOCOUPLE=m CONFIG_MAX_RAW_DEVS=8192 -# CONFIG_MAXSMP is not set +CONFIG_MAXSMP=y CONFIG_MB1232=m # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 85b9db7ba..31ad53c88 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2965,7 +2965,7 @@ CONFIG_MAX44009=m # CONFIG_MAX9611 is not set CONFIG_MAXIM_THERMOCOUPLE=m CONFIG_MAX_RAW_DEVS=8192 -# CONFIG_MAXSMP is not set +CONFIG_MAXSMP=y CONFIG_MB1232=m # CONFIG_MC3230 is not set # CONFIG_MCB is not set @@ -3920,7 +3920,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_MMU is not set # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set CONFIG_NOZOMI=m -CONFIG_NR_CPUS=1024 +CONFIG_NR_CPUS=8192 CONFIG_NS83820=m CONFIG_NTB_AMD=m CONFIG_NTB_IDT=m diff --git a/kernel.spec b/kernel.spec index a3df71ead..9c7732aa1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -495,8 +495,6 @@ Source5000: patch-5.%{base_sublevel}-git%{gitrev}.xz # Standalone patches # 100 - Generic long running patches -Patch110: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch - Patch111: input-kill-stupid-messages.patch Patch112: die-floppy-die.patch diff --git a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch b/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch deleted file mode 100644 index 5e6d6611e..000000000 --- a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Josh Boyer <jwboyer@fedoraproject.org> -Date: Mon, 11 Nov 2013 08:39:16 -0500 -Subject: [PATCH] lib/cpumask: Make CPUMASK_OFFSTACK usable without debug - dependency - -When CPUMASK_OFFSTACK was added in 2008, it was dependent upon -DEBUG_PER_CPU_MAPS being enabled, or an architecture could select it. -The debug dependency adds additional overhead that isn't required for -operation of the feature, and we need CPUMASK_OFFSTACK to increase the -NR_CPUS value beyond 512 on x86. We drop the current dependency and make -sure SMP is set. - -Bugzilla: N/A -Upstream-status: Nak'd, supposedly replacement coming to auto-select - -Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> ---- - lib/Kconfig | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/Kconfig b/lib/Kconfig -index 3a2ef67db6c7..4af1e7e5a611 100644 ---- a/lib/Kconfig -+++ b/lib/Kconfig -@@ -396,7 +396,8 @@ config CHECK_SIGNATURE - bool - - config CPUMASK_OFFSTACK -- bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS -+ bool "Force CPU masks off stack" -+ depends on SMP - help - Use dynamic allocation for cpumask_var_t, instead of putting - them on the stack. This is a bit more expensive, but avoids |