aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/902-debloat_proc.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-09-15 16:00:41 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-09-15 16:00:41 +0000
commit2d7844c116b6fca17535d5d0f99a22b12323e94a (patch)
treed4d295fb2cbe10aa39502d39d7094bc7149e2990 /target/linux/generic/patches-3.10/902-debloat_proc.patch
parent463cdf78fa5e8bca6e7ed00bd1e5af8e099d2982 (diff)
downloadmaster-187ad058-2d7844c116b6fca17535d5d0f99a22b12323e94a.tar.gz
master-187ad058-2d7844c116b6fca17535d5d0f99a22b12323e94a.tar.bz2
master-187ad058-2d7844c116b6fca17535d5d0f99a22b12323e94a.zip
kernel: update 3.10 to 3.10.12
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38000 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/902-debloat_proc.patch')
-rw-r--r--target/linux/generic/patches-3.10/902-debloat_proc.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/902-debloat_proc.patch b/target/linux/generic/patches-3.10/902-debloat_proc.patch
index 67ea753a10..907e04624c 100644
--- a/target/linux/generic/patches-3.10/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch
@@ -111,7 +111,7 @@
if (!root_irq_dir)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
-@@ -357,6 +357,8 @@ static int __init init_timer_list_procfs
+@@ -362,6 +362,8 @@ static int __init init_timer_list_procfs
{
struct proc_dir_entry *pe;
@@ -184,7 +184,7 @@
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
-@@ -2590,10 +2590,12 @@ static const struct file_operations fib_
+@@ -2587,10 +2587,12 @@ static const struct file_operations fib_
int __net_init fib_proc_init(struct net *net)
{
@@ -199,7 +199,7 @@
&fib_triestat_fops))
goto out2;
-@@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net
+@@ -2600,17 +2602,21 @@ int __net_init fib_proc_init(struct net
return 0;
out3: