kernel: define RB_ID_HW_OPTIONS in include/linux/routerboot.h

[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 c94f968..dc2a923 100644 (file)
--- a/target/linux/generic/patches-3.10/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch
@@ -111,7 +111,7 @@
        if (!root_irq_dir)
 --- a/kernel/time/timer_list.c
 +++ b/kernel/time/timer_list.c
-@@ -357,6 +357,8 @@ static int __init init_timer_list_procfs
+@@ -362,6 +362,8 @@ static int __init init_timer_list_procfs
  {
        struct proc_dir_entry *pe;
  
@@ -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
-@@ -2838,6 +2838,8 @@ static __net_initdata struct pernet_oper
+@@ -2839,6 +2839,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {
@@ -184,7 +184,7 @@
  
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
-@@ -2590,10 +2590,12 @@ static const struct file_operations fib_
+@@ -2587,10 +2587,12 @@ static const struct file_operations fib_
  
  int __net_init fib_proc_init(struct net *net)
  {
@@ -199,7 +199,7 @@
                         &fib_triestat_fops))
                goto out2;
  
-@@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net 
+@@ -2600,17 +2602,21 @@ int __net_init fib_proc_init(struct net
        return 0;
  
  out3:
@@ -251,7 +251,7 @@
  
 --- a/ipc/msg.c
 +++ b/ipc/msg.c
-@@ -136,6 +136,9 @@ void __init msg_init(void)
+@@ -134,6 +134,9 @@ void __init msg_init(void)
        printk(KERN_INFO "msgmni has been set to %d\n",
                init_ipc_ns.msg_ctlmni);
  
@@ -263,7 +263,7 @@
                                IPC_MSG_IDS, sysvipc_msg_proc_show);
 --- a/ipc/sem.c
 +++ b/ipc/sem.c
-@@ -184,6 +184,8 @@ void sem_exit_ns(struct ipc_namespace *n
+@@ -191,6 +191,8 @@ void sem_exit_ns(struct ipc_namespace *n
  void __init sem_init (void)
  {
        sem_init_ns(&init_ipc_ns);
@@ -274,7 +274,7 @@
                                IPC_SEM_IDS, sysvipc_sem_proc_show);
 --- a/ipc/shm.c
 +++ b/ipc/shm.c
-@@ -115,6 +115,8 @@ pure_initcall(ipc_ns_init);
+@@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init);
  
  void __init shm_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
-@@ -150,6 +150,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;