kernel: update linux 3.8 to 3.8.11

[openwrt/staging/yousong.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 e994c5b8838a329e1be1c557a7beeab85b6cd5f2..2489164189c3923973858545dfa832f9eec5391d 100644 (file)
--- a/target/linux/generic/patches-3.8/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.8/902-debloat_proc.patch
@@ -173,7 +173,7 @@
                goto err;
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -4578,9 +4578,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))
-@@ -4589,9 +4591,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;
-@@ -4601,8 +4605,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);
  
@@ -255,17 +255,6 @@
        proc_net_remove(net, "route");
  }
  
---- a/net/ipv4/igmp.c
-+++ b/net/ipv4/igmp.c
-@@ -2673,6 +2673,8 @@ static struct pernet_operations igmp_net
- 
- int __init igmp_mc_proc_init(void)
- {
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       return register_pernet_subsys(&igmp_net_ops);
- }
- #endif
 --- a/net/ipv4/ipmr.c
 +++ b/net/ipv4/ipmr.c
 @@ -71,6 +71,10 @@
@@ -339,7 +328,7 @@
                                "       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
 --- a/ipc/util.c
 +++ b/ipc/util.c
-@@ -148,6 +148,9 @@ void __init ipc_init_proc_interface(cons
+@@ -149,6 +149,9 @@ void __init ipc_init_proc_interface(cons
        struct proc_dir_entry *pde;
        struct ipc_proc_iface *iface;