diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-08-15 10:33:57 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-08-15 10:34:00 -0400 |
| commit | 98291540fff47c35fa6057b37f4577b6b5115d0c (patch) | |
| tree | aa1c4412742884f053a8e917e45798d9d8b2aec2 | |
| parent | 5dfb32b75b12fdadb7778cda78cfeecde9076d79 (diff) | |
| download | kernel-98291540fff47c35fa6057b37f4577b6b5115d0c.tar.gz kernel-98291540fff47c35fa6057b37f4577b6b5115d0c.tar.xz kernel-98291540fff47c35fa6057b37f4577b6b5115d0c.zip | |
Enable memory cgroup swap accounting (rhbz 982808)
| -rw-r--r-- | config-generic | 4 | ||||
| -rw-r--r-- | kernel.spec | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config-generic b/config-generic index 46ba526b..7e1ecf1c 100644 --- a/config-generic +++ b/config-generic @@ -4142,8 +4142,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 diff --git a/kernel.spec b/kernel.spec index 4c3f3b99..623822c8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2317,6 +2317,7 @@ fi %changelog * Thu Aug 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.6.10.7-200 +- Enable memory cgroup swap accounting (rhbz 982808) - Add patch to fix regression on TeVII S471 devices (rhbz 963715) - Linux v3.10.7 |