kernel: bcma: update to wireless-testing master-2013-10-01

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

diff --git a/target/linux/generic/patches-3.6/902-debloat_proc.patch b/target/linux/generic/patches-3.6/902-debloat_proc.patch
index a8ff00c..6bbe9d6 100644 (file)
--- a/target/linux/generic/patches-3.6/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.6/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 */
@@ -122,7 +122,7 @@
                return -ENOMEM;
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
-@@ -2641,6 +2641,8 @@ static const struct file_operations proc
+@@ -2639,6 +2639,8 @@ static const struct file_operations proc
  
  static int __init proc_vmalloc_init(void)
  {
@@ -266,19 +266,6 @@
        return register_pernet_subsys(&igmp_net_ops);
  }
  #endif
---- a/net/ipv4/ipmr.c
-+++ b/net/ipv4/ipmr.c
-@@ -70,6 +70,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
 @@ -498,6 +498,9 @@ static __net_initdata struct pernet_oper