diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-10 07:41:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-10 08:42:41 +0000 |
| commit | ea1a2b238c669ca08ced21bcb447010b2012a461 (patch) | |
| tree | 10077d6b56309fb5f865616d12780d8dc496c311 /main/linux-grsec | |
| parent | b9807b5270fb51620f723d9fe0e1688c19fd94cf (diff) | |
| download | aports-ea1a2b238c669ca08ced21bcb447010b2012a461.tar.bz2 aports-ea1a2b238c669ca08ced21bcb447010b2012a461.tar.xz | |
main/linux-grsec: enable cgroup memory controller for x86_64
fixes #3504
Diffstat (limited to 'main/linux-grsec')
| -rw-r--r-- | main/linux-grsec/APKBUILD | 8 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86_64 | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index c44d3258b1..addf65fd58 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=2 +pkgrel=3 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -170,7 +170,7 @@ cbc19671d2c8bab0eaf18bf3afa54f7b patch-3.14.37.xz c6a4ae7e8ca6159e1631545515805216 fix-memory-map-for-PIE-applications.patch 1a307fc1d63231bf01d22493a4f14378 imx6q-no-unclocked-sleep.patch 78060d5fe4d22f3ff8ebdad76f2a99f0 kernelconfig.x86 -6af32d44523b76b23714fd8eb6d7ee27 kernelconfig.x86_64 +4abbaf506227daec9a0e5b53464e1642 kernelconfig.x86_64 2088fe977722158d7989f928084d52ca kernelconfig.armhf" sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa linux-3.14.tar.xz ae2c25e7c53bffaf4e6f951a56eaa8ca645e7125cd28f16f870b7dc8aaa66b49 patch-3.14.37.xz @@ -178,7 +178,7 @@ ae2c25e7c53bffaf4e6f951a56eaa8ca645e7125cd28f16f870b7dc8aaa66b49 patch-3.14.37. 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7 fix-memory-map-for-PIE-applications.patch 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3 imx6q-no-unclocked-sleep.patch 66196a945d55ce0a164dc5a4303db77c1f47641ab8bf7b53e87f3f39bf23f356 kernelconfig.x86 -77ef1ce8fb80c93aaa9a1c629d5708a409184a72de480cd219f777eaec02caaf kernelconfig.x86_64 +d96e12edb7d6421b26650e280c2d6c4645d5221549295d15b5f6d6daacf215fb kernelconfig.x86_64 636419c6970c24ae6e02889f641aff606eb237c0ac1796efd992c545f77bc579 kernelconfig.armhf" sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e linux-3.14.tar.xz 40439c1262331ffd594a110bab6c2da04abd7718fb3f79661de46e0c7cd99d4d8e003bb412be2348df843d7d9abe310caf1e3cc1ec5343e4b92f0769b9cfada4 patch-3.14.37.xz @@ -186,5 +186,5 @@ a5cd91d5aed495a34393fe0d4a944b4d8f7b7beabdf007c079711699f4d8b8dfa573827aa0358ad9 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7 fix-memory-map-for-PIE-applications.patch 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221 imx6q-no-unclocked-sleep.patch 63b99a936f8ca561e42590ec639b2a86face1198c6a05d3450ff275ae3651f142e1a08795064562be7ad228097687f3fd745b19c1cdb0f48dcd1eeb2634fd46c kernelconfig.x86 -d1e5c64796e29bbed2c6460e6a240cb31ec0cb6c2a6467a459efa14a620a6c0003c01cc925e3de8e272bbf8a82d6afa639d7703f895d5d3ccea069ea82db5104 kernelconfig.x86_64 +f3f86dea3732ce5179aa1b542cdcecbe764b52b1449f1e86dbcf4d2fc3f85df7198f58db9dadb7747c7fbc2a6dcdc914cb1110bc0b669874ebc7062b13dd2e8c kernelconfig.x86_64 2b8d7afc769398b32eb03850069bde6ddb06ea54deea08d6c85356fb9c9d1d851ff3e72cf55d598aa2c56608efbf1b10e5051f1e07f0178dff5f1aa886fc843d kernelconfig.armhf" diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index fcad3f6a12..06efe3da33 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -145,7 +145,10 @@ CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -160,6 +163,7 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y |