X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch;fp=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch;h=36d3ee1ac3a5c070aa63ebe437c4ad12a3f29905;hb=67dcc43f3a22dc3a7ac07a7065971b426feeb043;hp=0000000000000000000000000000000000000000;hpb=47a93a810f78adce5a130d287f82b28e9b54313c;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch
new file mode 100644
index 0000000000..36d3ee1ac3
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.19/950-0386-Revert-cgroup-Disable-cgroup-memory-by-default.patch
@@ -0,0 +1,63 @@
+From 49b6bb41655247c123cdc46dd49276a107c8b1d2 Mon Sep 17 00:00:00 2001
+From: P33M <p33m@github.com>
+Date: Wed, 24 Apr 2019 14:25:09 +0100
+Subject: [PATCH] Revert "cgroup: Disable cgroup "memory" by default"
+
+This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b.
+---
+ kernel/cgroup/cgroup.c | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+--- a/kernel/cgroup/cgroup.c
++++ b/kernel/cgroup/cgroup.c
+@@ -5334,8 +5334,6 @@ int __init cgroup_init_early(void)
+ }
+ 
+ static u16 cgroup_disable_mask __initdata;
+-static u16 cgroup_enable_mask __initdata;
+-static int __init cgroup_disable(char *str);
+ 
+ /**
+  * cgroup_init - cgroup initialization
+@@ -5376,12 +5374,6 @@ int __init cgroup_init(void)
+ 
+ 	mutex_unlock(&cgroup_mutex);
+ 
+-	/* Apply an implicit disable... */
+-	cgroup_disable("memory");
+-
+-	/* ...knowing that an explicit enable will override it. */
+-	cgroup_disable_mask &= ~cgroup_enable_mask;
+-
+ 	for_each_subsys(ss, ssid) {
+ 		if (ss->early_init) {
+ 			struct cgroup_subsys_state *css =
+@@ -5773,28 +5765,6 @@ 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_enable_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