2016-02-25 10:14:01 +00:00
|
|
|
From 3bbfaaf97f167d4f889c41822c4e767947fd1995 Mon Sep 17 00:00:00 2001
|
2016-01-17 10:42:23 +00:00
|
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
|
|
|
Date: Wed, 18 Dec 2013 22:16:19 +0000
|
2016-02-25 10:14:01 +00:00
|
|
|
Subject: [PATCH 062/156] config: Enable CONFIG_MEMCG, but leave it disabled
|
2016-01-17 10:42:23 +00:00
|
|
|
(due to memory cost). Enable with cgroup_enable=memory.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
kernel/cgroup.c | 23 ++++++++++++++++++++++-
|
|
|
|
|
1 file changed, 22 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/kernel/cgroup.c
|
|
|
|
|
+++ b/kernel/cgroup.c
|
|
|
|
|
@@ -5273,7 +5273,7 @@ int __init cgroup_init_early(void)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-static unsigned long cgroup_disable_mask __initdata;
|
|
|
|
|
+static unsigned long cgroup_disable_mask __initdata = 1<<0;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* cgroup_init - cgroup initialization
|
|
|
|
|
@@ -5769,6 +5769,27 @@ 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) &&
|
|
|
|
|
+ strcmp(token, ss->legacy_name))
|
|
|
|
|
+ continue;
|
|
|
|
|
+ cgroup_disable_mask &= ~(1 << i);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ return 1;
|
|
|
|
|
+}
|
|
|
|
|
+__setup("cgroup_enable=", cgroup_enable);
|
|
|
|
|
+
|
|
|
|
|
/**
|
|
|
|
|
* css_tryget_online_from_dir - get corresponding css from a cgroup dentry
|
|
|
|
|
* @dentry: directory dentry of interest
|
