diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-12 16:09:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-12 16:09:59 +0000 |
| commit | 2b416d208af3177894e10e4753ab9300a5e9d80d (patch) | |
| tree | 2a4d24cf5547365a32a930bd273b2f1a9340b1dc /main/linux-grsec/kernelconfig.x86 | |
| parent | 966805d1e107151c1479109c7a36f863a706fdbe (diff) | |
main/linux-grsec: upgrade to grsecurity-2.2.0-2.6.32.18-201008112233
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 5f4cb8c2b4b..ec5f8db345f 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.15 -# Wed Jun 16 07:30:34 2010 +# Linux kernel version: 2.6.32.16 +# Thu Aug 12 15:19:19 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1059,6 +1059,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_PID=y @@ -4478,7 +4479,7 @@ CONFIG_PAX_PAGEEXEC=y # CONFIG_PAX_SEGMEXEC is not set CONFIG_PAX_EMUTRAMP=y CONFIG_PAX_MPROTECT=y -CONFIG_PAX_NOELFRELOCS=y +# CONFIG_PAX_ELFRELOCS is not set CONFIG_PAX_KERNEXEC=y CONFIG_PAX_KERNEXEC_MODULE_TEXT=4 |