rpms/kernel
7
2
Fork 4
Code Issues Pull Requests Releases Activity

Reenable cgroups memory controller (rhbz 845285)

Browse Source
This commit is contained in:
Josh Boyer 2012-08-02 11:07:53 -04:00
parent 7eb10928fe
commit 6d2fcab7e3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config-generic
View File

@ -3926,10 +3926,10 @@ CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_SCHED=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_MEMCG=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount' CONFIG_MEMCG_SWAP=y # XXX disabled by default, pass 'swapaccount'
# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set # CONFIG_MEMCG_SWAP_ENABLED is not set
CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y CONFIG_MEMCG_KMEM=y
# CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_HUGETLB is not set
CONFIG_CGROUP_PERF=y CONFIG_CGROUP_PERF=y
CONFIG_BLK_CGROUP=y CONFIG_BLK_CGROUP=y

1
kernel.spec
View File

@ -2295,6 +2295,7 @@ fi
# || || # || ||
%changelog %changelog
* Thu Aug 02 2012 Josh Boyer <jwboyer@redhat.com> * Thu Aug 02 2012 Josh Boyer <jwboyer@redhat.com>
- Reenable cgroups memory controller (rhbz 845285)
- Add two patches from Seth Forshee to fix brcmsmac backtrace - Add two patches from Seth Forshee to fix brcmsmac backtrace
* Thu Aug 02 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc0.git9.1 * Thu Aug 02 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc0.git9.1