2015-08-17 06:04:32 +00:00
|
|
|
From 7a190806d076ec3adaab102f8dd2cfaca16c1067 Mon Sep 17 00:00:00 2001
|
2015-07-17 12:48:39 +00:00
|
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
|
|
|
Date: Wed, 18 Dec 2013 22:16:19 +0000
|
2015-08-17 06:04:32 +00:00
|
|
|
Subject: [PATCH 033/148] config: Enable CONFIG_MEMCG, but leave it disabled
|
2015-07-17 12:48:39 +00:00
|
|
|
(due to memory cost). Enable with cgroup_enable=memory.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
kernel/cgroup.c | 23 +++++++++++++++++++++++
|
|
|
|
|
mm/memcontrol.c | 1 +
|
|
|
|
|
2 files changed, 24 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/kernel/cgroup.c
|
|
|
|
|
+++ b/kernel/cgroup.c
|
2015-07-22 12:51:11 +00:00
|
|
|
@@ -5393,6 +5393,29 @@ static int __init cgroup_disable(char *s
|
2015-07-17 12:48:39 +00:00
|
|
|
}
|
|
|
|
|
__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
|
|
|
|
|
@@ -5388,6 +5388,7 @@ struct cgroup_subsys memory_cgrp_subsys
|
|
|
|
|
.dfl_cftypes = memory_files,
|
|
|
|
|
.legacy_cftypes = mem_cgroup_legacy_files,
|
|
|
|
|
.early_init = 0,
|
|
|
|
|
+ .disabled = 1,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
