diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-05-16 11:39:01 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-05-16 11:39:01 -0400 |
| commit | 3424e30d752def87c12cc2b819f35cbe343d8dec (patch) | |
| tree | f44cd3ea4f5737cf4878e46c83859d1def41602f | |
| parent | e26533c072001a7df7e9fa476eb4f2b233d1aced (diff) | |
| download | kernel-3424e30d752def87c12cc2b819f35cbe343d8dec.tar.gz kernel-3424e30d752def87c12cc2b819f35cbe343d8dec.tar.xz kernel-3424e30d752def87c12cc2b819f35cbe343d8dec.zip | |
Enable memory cgroup swap accounting (rhbz 918951)
- Fix config-local usage (rhbz 950841)
| -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 50918d378..7d162aa65 100644 --- a/config-generic +++ b/config-generic @@ -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 diff --git a/kernel.spec b/kernel.spec index 0ac98f6f0..27f84658b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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 |