diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-28 10:12:09 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-28 10:12:09 -0300 |
commit | 051321090b2f7c869cf26fea237dbc37e1922bfc (patch) | |
tree | 70fd422b5fff0f7dd5263581eadafa350d33b707 /libre/linux-libre-grsec/config.i686 | |
parent | c032b26d1935f3239fd56bc0cc23fadc35a6c138 (diff) | |
parent | add67d4739720737bdc39829fad0a2c206d76347 (diff) |
Merge branch 'master' of projects.parabolagnulinux.org:abslibre
Diffstat (limited to 'libre/linux-libre-grsec/config.i686')
-rw-r--r-- | libre/linux-libre-grsec/config.i686 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index 7fb6a2cd4..d0db896c0 100644 --- a/libre/linux-libre-grsec/config.i686 +++ b/libre/linux-libre-grsec/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.15.5.201407170639-2 Kernel Configuration +# Linux/x86 3.15.6.201407232200-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -6498,7 +6498,7 @@ CONFIG_PAX_MPROTECT=y # CONFIG_PAX_ELFRELOCS is not set CONFIG_PAX_KERNEXEC=y CONFIG_PAX_KERNEXEC_PLUGIN_METHOD="" -CONFIG_PAX_KERNEXEC_MODULE_TEXT=4 +CONFIG_PAX_KERNEXEC_MODULE_TEXT=12 # # Address Space Layout Randomization |