aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-grsec/kernelconfig.x86
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-03-03 12:07:54 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-03-03 12:07:54 +0000
commitc14895917b22f1e10ba2b8a838149804e2d99a19 (patch)
tree9bbba6061f49072329cf4f7283ac1bdc2482f4b0 /main/linux-grsec/kernelconfig.x86
parent6ccb0d096dd025dbb7a341c70d7dd8b651d2b142 (diff)
downloadaports-c14895917b22f1e10ba2b8a838149804e2d99a19.tar.bz2
aports-c14895917b22f1e10ba2b8a838149804e2d99a19.tar.xz
main/linux-grsec: upgraed to grsecurity-2.1.14-2.6.32.9-201002231820
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 a0b44d4889..f52e8e557d 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.6
-# Fri Jan 29 10:27:23 2010
+# Linux kernel version: 2.6.32.9
+# Wed Mar 3 11:01:05 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -291,7 +291,6 @@ CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
-CONFIG_X86_CPU_DEBUG=m
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
@@ -4413,6 +4412,7 @@ CONFIG_PAX_EMUTRAMP=y
CONFIG_PAX_MPROTECT=y
CONFIG_PAX_NOELFRELOCS=y
CONFIG_PAX_KERNEXEC=y
+CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
#
# Address Space Layout Randomization