aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/902-debloat_proc.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2016-03-03 22:28:12 +0000
committerHauke Mehrtens <hauke@openwrt.org>2016-03-03 22:28:12 +0000
commit5ce6da3d7a65968c6c82b75c31009b0f7bcf528e (patch)
tree97c5c16b260853f6c026fe0abfcc8e17440ebad5 /target/linux/generic/patches-3.18/902-debloat_proc.patch
parent124c1ca86a3c7745555636d67e3d99ad75b07aed (diff)
downloadupstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.tar.gz
upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.tar.bz2
upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.zip
CC: kernel: update kernel 3.18 to version 3.18.27
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.24 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.25 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.26 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.27 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48896 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/902-debloat_proc.patch')
-rw-r--r--target/linux/generic/patches-3.18/902-debloat_proc.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/902-debloat_proc.patch b/target/linux/generic/patches-3.18/902-debloat_proc.patch
index 5cecd1e677..79cecf90d4 100644
--- a/target/linux/generic/patches-3.18/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.18/902-debloat_proc.patch
@@ -1,6 +1,6 @@
--- a/fs/locks.c
+++ b/fs/locks.c
-@@ -2611,6 +2611,8 @@ static const struct file_operations proc
+@@ -2620,6 +2620,8 @@ static const struct file_operations proc
static int __init proc_locks_init(void)
{
@@ -173,7 +173,7 @@
goto err;
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -2934,6 +2934,8 @@ static __net_initdata struct pernet_oper
+@@ -2933,6 +2933,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{