aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-15 11:18:54 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-16 10:08:54 +0200
commite80af4b53bc34be2dad0b70b37556d92373c4041 (patch)
tree36b125c51a65769650de29e1bde29c38fe925079 /target
parent912340033a58f881a1ee6b0c4b04ef58230d9e08 (diff)
downloadupstream-e80af4b53bc34be2dad0b70b37556d92373c4041.tar.gz
upstream-e80af4b53bc34be2dad0b70b37556d92373c4041.tar.bz2
upstream-e80af4b53bc34be2dad0b70b37556d92373c4041.zip
kernel: bump 4.9 to 4.9.133
Refreshed all patches. Compile-tested on: ar71xx, layerscape Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch4
-rw-r--r--target/linux/generic/hack-4.9/902-debloat_proc.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
index 016d9cd99e..5dc823336d 100644
--- a/target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5632,7 +5632,7 @@ int __init cgroup_init_early(void)
+@@ -5636,7 +5636,7 @@ int __init cgroup_init_early(void)
return 0;
}
@@ -19,7 +19,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to
/**
* cgroup_init - cgroup initialization
-@@ -6173,6 +6173,28 @@ static int __init cgroup_no_v1(char *str
+@@ -6177,6 +6177,28 @@ static int __init cgroup_no_v1(char *str
}
__setup("cgroup_no_v1=", cgroup_no_v1);
diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch
index cab7276d29..cff6168083 100644
--- a/target/linux/generic/hack-4.9/902-debloat_proc.patch
+++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch
@@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
-@@ -1796,10 +1796,12 @@ static int __init setup_vmstat(void)
+@@ -1799,10 +1799,12 @@ static int __init setup_vmstat(void)
cpu_notifier_register_done();
#endif
#ifdef CONFIG_PROC_FS