diff options
author | aurelien <tek@localhost.localdomain> | 2012-11-24 09:26:36 +0100 |
---|---|---|
committer | aurelien <tek@localhost.localdomain> | 2012-11-24 09:26:36 +0100 |
commit | ab0be3de19998f413b3b1406f2efb26076abdef7 (patch) | |
tree | 56ff4526a8cb5457513710efd5a660132cababf3 /kernels/linux-libre-grsec/config.x86_64 | |
parent | 0a9a064dde6943f5ce78d9eb03f403326cd5b4ef (diff) | |
parent | 4591321353c89b7069c32cd0f83b36c6d825ddcc (diff) |
Merge http://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'kernels/linux-libre-grsec/config.x86_64')
-rw-r--r-- | kernels/linux-libre-grsec/config.x86_64 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64 index 281b26f47..c1729bff5 100644 --- a/kernels/linux-libre-grsec/config.x86_64 +++ b/kernels/linux-libre-grsec/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.1-2 Kernel Configuration +# Linux/x86_64 3.6.7-4 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -5609,6 +5609,7 @@ CONFIG_PAX_USERCOPY=y # CONFIG_GRKERNSEC_KMEM=y # CONFIG_GRKERNSEC_IO is not set +CONFIG_GRKERNSEC_JIT_HARDEN=y CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y @@ -5690,7 +5691,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y # Sysctl Support # CONFIG_GRKERNSEC_SYSCTL=y -# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set CONFIG_GRKERNSEC_SYSCTL_ON=y # |