Enable memory cgroup swap accounting (rhbz 918951)

- Fix config-local usage (rhbz 950841)
This commit is contained in:
Josh Boyer 2013-05-16 11:39:01 -04:00
parent e26533c072
commit 3424e30d75
2 changed files with 3 additions and 2 deletions

View File

@ -4196,8 +4196,8 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_SCHED=y
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y # XXX disabled by default, pass 'swapaccount'
# CONFIG_MEMCG_SWAP_ENABLED is not set
CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG_SWAP_ENABLED=y
CONFIG_MEMCG_KMEM=y
# CONFIG_CGROUP_HUGETLB is not set
CONFIG_CGROUP_PERF=y

View File

@ -2226,6 +2226,7 @@ fi
# || ||
%changelog
* Thu May 16 2013 Josh Boyer <jwboyer@redhat.com>
- Enable memory cgroup swap accounting (rhbz 918951)
- Fix config-local usage (rhbz 950841)
* Wed May 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git5.1