kernel: backport upstream bridge multicast snooping fixes

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

diff --git a/target/linux/generic/patches-3.10/902-debloat_proc.patch b/target/linux/generic/patches-3.10/902-debloat_proc.patch
index fd50eb1a28d8cfe264a873a7246c246e3d44468c..6f551877da10215134ca5db364ef66a069ab5349 100644 (file)
--- a/target/linux/generic/patches-3.10/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch
@@ -1,6 +1,6 @@
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -2267,6 +2267,8 @@ static const struct file_operations proc
+@@ -2266,6 +2266,8 @@ static const struct file_operations proc
  
  static int __init proc_locks_init(void)
  {
@@ -133,7 +133,7 @@
  }
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -1241,10 +1241,12 @@ static int __init setup_vmstat(void)
+@@ -1242,10 +1242,12 @@ static int __init setup_vmstat(void)
                start_cpu_timer(cpu);
  #endif
  #ifdef CONFIG_PROC_FS
@@ -173,7 +173,7 @@
                goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2839,6 +2839,8 @@ static __net_initdata struct pernet_oper
+@@ -2891,6 +2891,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {
@@ -285,7 +285,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
-@@ -158,6 +158,9 @@ void __init ipc_init_proc_interface(cons
+@@ -173,6 +173,9 @@ void __init ipc_init_proc_interface(cons
        struct proc_dir_entry *pde;
        struct ipc_proc_iface *iface;