kernel: allow building zsmalloc as a module again

[oweals/openwrt.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 2489164189c3923973858545dfa832f9eec5391d..4479e44998cb14f8a85f8fed1a7f2397aa29d050 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 */
@@ -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