kernel: refresh patches for kernel 3.8.13

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.8 / 902-debloat_proc.patch

diff --git a/target/linux/generic/patches-3.8/902-debloat_proc.patch b/target/linux/generic/patches-3.8/902-debloat_proc.patch
index 650b3c2d05ee18f2a0e2244f33bddc13c3b8a934..3ac9914fa2fd49f05bc8a0d9a0035dc03acd0e30 100644 (file)
--- a/target/linux/generic/patches-3.8/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.8/902-debloat_proc.patch
@@ -83,7 +83,7 @@
  {
        char name [MAX_NAMELEN];
  
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
 +              return;
 +
        if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir)
@@ -93,7 +93,7 @@
  {
        char name [MAX_NAMELEN];
  
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
 +              return;
 +
        if (!root_irq_dir || !desc->dir)
@@ -103,7 +103,7 @@
        unsigned int irq;
        struct irq_desc *desc;
  
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++      if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
 +              return;
 +
        /* create /proc/irq */
@@ -173,7 +173,7 @@
                goto err;
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -4584,9 +4584,11 @@ static int __net_init dev_proc_net_init(
+@@ -4588,9 +4588,11 @@ static int __net_init dev_proc_net_init(
  
        if (!proc_net_fops_create(net, "dev", S_IRUGO, &dev_seq_fops))
                goto out;
@@ -187,7 +187,7 @@
                goto out_softnet;
  
        if (wext_proc_init(net))
-@@ -4595,9 +4597,11 @@ static int __net_init dev_proc_net_init(
+@@ -4599,9 +4601,11 @@ static int __net_init dev_proc_net_init(
  out:
        return rc;
  out_ptype:
@@ -201,7 +201,7 @@
  out_dev:
        proc_net_remove(net, "dev");
        goto out;
-@@ -4607,8 +4611,10 @@ static void __net_exit dev_proc_net_exit
+@@ -4611,8 +4615,10 @@ static void __net_exit dev_proc_net_exit
  {
        wext_proc_exit(net);
  
@@ -227,7 +227,7 @@
  
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
-@@ -2607,10 +2607,12 @@ static const struct file_operations fib_
+@@ -2608,10 +2608,12 @@ static const struct file_operations fib_
  
  int __net_init fib_proc_init(struct net *net)
  {
@@ -242,7 +242,7 @@
                                  &fib_triestat_fops))
                goto out2;
  
-@@ -2629,8 +2631,10 @@ out1:
+@@ -2630,8 +2632,10 @@ out1:
  
  void __net_exit fib_proc_exit(struct net *net)
  {
@@ -255,19 +255,6 @@
        proc_net_remove(net, "route");
  }
  
---- 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
 @@ -502,6 +502,9 @@ static __net_initdata struct pernet_oper