aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-grsec/kernelconfig.x86
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-11-16 03:39:08 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-11-16 03:41:30 -0600
commit762e510f082f422e3219c9ec270bcf5b48395adf (patch)
tree78507912f8136fd43d2ef24c48d447699b1b5bd4 /main/linux-grsec/kernelconfig.x86
parent968ba98ecd762d28318716445141e5c1863deefb (diff)
main/linux-grsec: SMP-related bugfixes (see extended commit message)
[x86] - enable CONFIG_X86_BIGSMP - set CONFIG_NR_CPUS to 32 [x86_64] - set CONFIG_NR_CPUS to 32 With CONFIG_NR_CPUS > 8 on x86, the kernel may hang upon encountering more than 8 logical CPUs without CONFIG_X86_BIGSMP enabled. x86_64 does not have this problem, but as a side effect of the CONFIG_X86_BIGSMP change, needed to have CONFIG_NR_CPUS adjusted there as well. Discussions on various distribution lists: Alpine: http://lists.alpinelinux.org/alpine-devel/0496.html Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=480844 rPath: https://issues.rpath.com/browse/RPL-3022
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
-rw-r--r--main/linux-grsec/kernelconfig.x866
1 files changed, 3 insertions, 3 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 46304258786..e1a841c2604 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.8 Kernel Configuration
+# Linux/i386 3.0.9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -270,7 +270,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y
CONFIG_X86_MPPARSE=y
-# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_BIGSMP=y
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_MRST is not set
# CONFIG_X86_RDC321X is not set
@@ -339,7 +339,7 @@ CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y
# CONFIG_IOMMU_HELPER is not set
# CONFIG_IOMMU_API is not set
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS=32
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_IRQ_TIME_ACCOUNTING=y