aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-03 13:40:15 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-03 17:00:29 +0200
commit794771afde99814b00485f335553d7203874eaea (patch)
tree6121c24a0f68eef296e707bfbfccfae4e4bfe3c1 /target/linux/brcm2708/patches-4.14
parentff88d943727bb65ed31ed8893de1623ff635d0ae (diff)
downloadupstream-794771afde99814b00485f335553d7203874eaea.tar.gz
upstream-794771afde99814b00485f335553d7203874eaea.tar.bz2
upstream-794771afde99814b00485f335553d7203874eaea.zip
kernel: bump 4.14 to 4.14.123
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch6
1 files changed, 3 insertions, 3 deletions
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 eb85fe6439..e231841d88 100644
--- 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)
+@@ -5168,6 +5168,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)
+@@ -5206,6 +5208,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
+@@ -5589,6 +5597,28 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);