| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364 |
- From 32839a570568823b3a1128bb1ae6c5fe3e9870af Mon Sep 17 00:00:00 2001
- From: popcornmix <popcornmix@gmail.com>
- Date: Wed, 18 Dec 2013 22:16:19 +0000
- Subject: [PATCH 024/114] config: Enable CONFIG_MEMCG, but leave it disabled
- (due to memory cost). Enable with cgroup_enable=memory.
- ---
- arch/arm/configs/bcmrpi_defconfig | 1 +
- kernel/cgroup.c | 23 +++++++++++++++++++++++
- mm/memcontrol.c | 1 +
- 3 files changed, 25 insertions(+)
- --- a/arch/arm/configs/bcmrpi_defconfig
- +++ b/arch/arm/configs/bcmrpi_defconfig
- @@ -19,6 +19,7 @@ CONFIG_CGROUP_FREEZER=y
- CONFIG_CGROUP_DEVICE=y
- CONFIG_CGROUP_CPUACCT=y
- CONFIG_RESOURCE_COUNTERS=y
- +CONFIG_MEMCG=y
- CONFIG_BLK_CGROUP=y
- CONFIG_NAMESPACES=y
- CONFIG_SCHED_AUTOGROUP=y
- --- a/kernel/cgroup.c
- +++ b/kernel/cgroup.c
- @@ -5319,6 +5319,29 @@ static int __init cgroup_disable(char *s
- }
- __setup("cgroup_disable=", cgroup_disable);
-
- +static int __init cgroup_enable(char *str)
- +{
- + struct cgroup_subsys *ss;
- + char *token;
- + int i;
- +
- + while ((token = strsep(&str, ",")) != NULL) {
- + if (!*token)
- + continue;
- +
- + for_each_subsys(ss, i) {
- + if (!strcmp(token, ss->name)) {
- + ss->disabled = 0;
- + printk(KERN_INFO "Enabling %s control group"
- + " subsystem\n", ss->name);
- + break;
- + }
- + }
- + }
- + return 1;
- +}
- +__setup("cgroup_enable=", cgroup_enable);
- +
- static int __init cgroup_set_legacy_files_on_dfl(char *str)
- {
- printk("cgroup: using legacy files on the default hierarchy\n");
- --- a/mm/memcontrol.c
- +++ b/mm/memcontrol.c
- @@ -6208,6 +6208,7 @@ struct cgroup_subsys memory_cgrp_subsys
- .bind = mem_cgroup_bind,
- .legacy_cftypes = mem_cgroup_files,
- .early_init = 0,
- + .disabled = 1,
- };
-
- #ifdef CONFIG_MEMCG_SWAP
|
