summaryrefslogtreecommitdiff
path: root/libre/linux-libre-grsec/config.x86_64
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-07-24 18:57:13 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-07-24 18:57:13 -0300
commit52a175ab2e683d8dcb8400c054b96d37db0f3d20 (patch)
tree1581fefed2f0c63e6b82acc545428c0c992eae06 /libre/linux-libre-grsec/config.x86_64
parent67a2af695512d455d925a28378806d9baac68a15 (diff)
parent2bc0e4fd509e9a6ab24013506be8167e5085ff5f (diff)
downloadabslibre-52a175ab2e683d8dcb8400c054b96d37db0f3d20.tar.gz
abslibre-52a175ab2e683d8dcb8400c054b96d37db0f3d20.tar.bz2
abslibre-52a175ab2e683d8dcb8400c054b96d37db0f3d20.zip
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre/linux-libre-grsec/config.x86_64')
-rw-r--r--libre/linux-libre-grsec/config.x86_646
1 files changed, 3 insertions, 3 deletions
diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64
index 6d2def186..ba786a3fe 100644
--- a/libre/linux-libre-grsec/config.x86_64
+++ b/libre/linux-libre-grsec/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.15.3.201407012153-2 Kernel Configuration
+# Linux/x86 3.15.5.201407170639-2 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -463,7 +463,7 @@ CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -6280,7 +6280,7 @@ CONFIG_PAX_RANDMMAP=y
#
# Miscellaneous hardening features
#
-# CONFIG_PAX_MEMORY_SANITIZE is not set
+CONFIG_PAX_MEMORY_SANITIZE=y
CONFIG_PAX_MEMORY_STACKLEAK=y
CONFIG_PAX_MEMORY_STRUCTLEAK=y
CONFIG_PAX_REFCOUNT=y