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 eb85fe6439804feffa2e10b4d46f134b7b04996a..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
-@@ -5162,6 +5162,8 @@ int __init cgroup_init_early(void)
+@@ -5206,6 +5206,8 @@ int __init cgroup_init_early(void)
  }
  
  static u16 cgroup_disable_mask __initdata;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  
  /**
   * cgroup_init - cgroup initialization
-@@ -5200,6 +5202,12 @@ int __init cgroup_init(void)
+@@ -5244,6 +5246,12 @@ int __init cgroup_init(void)
  
        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 =
-@@ -5583,6 +5591,28 @@ static int __init cgroup_disable(char *s
+@@ -5635,6 +5643,28 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);