kernel: update linux 3.9 to 3.9.8

[oweals/openwrt.git] / target / linux / generic / patches-3.9 / 902-debloat_proc.patch

diff --git a/target/linux/generic/patches-3.9/902-debloat_proc.patch b/target/linux/generic/patches-3.9/902-debloat_proc.patch
index 318db6370d3ba2ea27c3caa23a0c5a89e331e317..bae40afde3f0a09332cddfc703da7eba0f00e359 100644 (file)
--- a/target/linux/generic/patches-3.9/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.9/902-debloat_proc.patch
@@ -173,7 +173,7 @@
                goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2857,6 +2857,8 @@ static __net_initdata struct pernet_oper
+@@ -2845,6 +2845,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {
@@ -184,7 +184,7 @@
  
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
-@@ -2598,10 +2598,12 @@ static const struct file_operations fib_
+@@ -2599,10 +2599,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;
  
-@@ -2611,17 +2613,21 @@ int __net_init fib_proc_init(struct net
+@@ -2612,17 +2614,21 @@ int __net_init fib_proc_init(struct net
        return 0;
  
  out3:
@@ -225,19 +225,6 @@
        remove_proc_entry("route", net->proc_net);
  }
  
---- a/net/ipv4/ipmr.c
-+++ b/net/ipv4/ipmr.c
-@@ -71,6 +71,10 @@
- #define CONFIG_IP_PIMSM       1
- #endif
- 
-+#ifdef CONFIG_PROC_STRIPPED
-+#undef CONFIG_PROC_FS
-+#endif
-+
- struct mr_table {
-       struct list_head        list;
- #ifdef CONFIG_NET_NS
 --- a/net/ipv4/proc.c
 +++ b/net/ipv4/proc.c
 @@ -503,6 +503,9 @@ static __net_initdata struct pernet_oper