diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-02 07:45:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-02 08:04:52 +0000 |
| commit | c799b413c6432906d78548a0bac3a9020ca9fa99 (patch) | |
| tree | 9b49350cfd92e6452bac9f1dae59bed2d65d7d38 /main/linux-grsec/kernelconfig.x86 | |
| parent | 132f57eb1a19c69056716167c0586622674a9e5c (diff) | |
| download | aports-c799b413c6432906d78548a0bac3a9020ca9fa99.tar.bz2 aports-c799b413c6432906d78548a0bac3a9020ca9fa99.tar.xz | |
main/linux-grsec: upgrade to 3.8.11 and enable KERNEXEC and CONSTIFY for x86
We still have KERNEXEC disabled for x86_64 due to XEN.
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index c14d186c63..5ec1318310 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.7 Kernel Configuration +# Linux/i386 3.8.11 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -356,7 +356,6 @@ CONFIG_X86_GENERIC=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 # CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_F00F_BUG=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 @@ -5287,10 +5286,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set # CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y @@ -5419,7 +5415,9 @@ CONFIG_PAX_EMUTRAMP=y CONFIG_PAX_MPROTECT=y # CONFIG_PAX_MPROTECT_COMPAT is not set # CONFIG_PAX_ELFRELOCS is not set +CONFIG_PAX_KERNEXEC=y CONFIG_PAX_KERNEXEC_PLUGIN_METHOD="" +CONFIG_PAX_KERNEXEC_MODULE_TEXT=4 # # Address Space Layout Randomization @@ -5436,6 +5434,7 @@ CONFIG_PAX_RANDMMAP=y CONFIG_PAX_MEMORY_STRUCTLEAK=y CONFIG_PAX_MEMORY_UDEREF=y CONFIG_PAX_REFCOUNT=y +CONFIG_PAX_CONSTIFY_PLUGIN=y CONFIG_PAX_USERCOPY=y # CONFIG_PAX_USERCOPY_DEBUG is not set # CONFIG_PAX_SIZE_OVERFLOW is not set |