Reenable cgroups memory controller (rhbz 845285)
This commit is contained in:
parent
7eb10928fe
commit
6d2fcab7e3
@ -3926,10 +3926,10 @@ CONFIG_CGROUP_CPUACCT=y
|
||||
CONFIG_CGROUP_DEVICE=y
|
||||
CONFIG_CGROUP_FREEZER=y
|
||||
CONFIG_CGROUP_SCHED=y
|
||||
CONFIG_CGROUP_MEM_RES_CTLR=y
|
||||
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount'
|
||||
# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
|
||||
CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
|
||||
CONFIG_MEMCG=y
|
||||
CONFIG_MEMCG_SWAP=y # XXX disabled by default, pass 'swapaccount'
|
||||
# CONFIG_MEMCG_SWAP_ENABLED is not set
|
||||
CONFIG_MEMCG_KMEM=y
|
||||
# CONFIG_CGROUP_HUGETLB is not set
|
||||
CONFIG_CGROUP_PERF=y
|
||||
CONFIG_BLK_CGROUP=y
|
||||
|
@ -2295,6 +2295,7 @@ fi
|
||||
# || ||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
* Thu Aug 02 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc0.git9.1
|
||||
|
Loading…
Reference in New Issue
Block a user