projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.138
[openwrt/openwrt.git]
/
target
/
linux
/
brcm2708
/
patches-4.14
/
950-0136-cgroup-Disable-cgroup-memory-by-default.patch
diff --git
a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
index 9011de8b96513930f7a8913a7dfb346e31c00f90..fa0ebffb27951909b8f47cbc49ebc581e772c7a2 100644
(file)
--- a/
target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/
target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
@@
-17,7
+17,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
-@@ -5
162,6 +5162
,8 @@ int __init cgroup_init_early(void)
+@@ -5
206,6 +5206
,8 @@ int __init cgroup_init_early(void)
}
static u16 cgroup_disable_mask __initdata;
}
static u16 cgroup_disable_mask __initdata;
@@
-26,7
+26,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/**
* cgroup_init - cgroup initialization
/**
* cgroup_init - cgroup initialization
-@@ -52
00,6 +5202
,12 @@ int __init cgroup_init(void)
+@@ -52
44,6 +5246
,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex);
mutex_unlock(&cgroup_mutex);
@@
-39,7
+39,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
-@@ -5
580,6 +5588
,28 @@ static int __init cgroup_disable(char *s
+@@ -5
635,6 +5643
,28 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);
}
__setup("cgroup_disable=", cgroup_disable);