kernel: update 3.14 to 3.14.32

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

diff --git a/target/linux/generic/patches-3.14/902-debloat_proc.patch b/target/linux/generic/patches-3.14/902-debloat_proc.patch
index 541f04620f888da452d56aaec8b0b0215bf1e972..55e21a43ba38c367ddc40d32cc0ed1037f793580 100644 (file)
--- a/target/linux/generic/patches-3.14/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.14/902-debloat_proc.patch
@@ -1,6 +1,6 @@
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -2429,6 +2429,8 @@ static const struct file_operations proc
+@@ -2441,6 +2441,8 @@ static const struct file_operations proc
  
  static int __init proc_locks_init(void)
  {
@@ -79,7 +79,7 @@
  }
 --- a/kernel/irq/proc.c
 +++ b/kernel/irq/proc.c
-@@ -311,6 +311,9 @@ void register_irq_proc(unsigned int irq,
+@@ -328,6 +328,9 @@ void register_irq_proc(unsigned int irq,
  {
        char name [MAX_NAMELEN];
  
@@ -89,7 +89,7 @@
        if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir)
                return;
  
-@@ -347,6 +350,9 @@ void unregister_irq_proc(unsigned int ir
+@@ -364,6 +367,9 @@ void unregister_irq_proc(unsigned int ir
  {
        char name [MAX_NAMELEN];
  
@@ -99,7 +99,7 @@
        if (!root_irq_dir || !desc->dir)
                return;
  #ifdef CONFIG_SMP
-@@ -382,6 +388,9 @@ void init_irq_proc(void)
+@@ -399,6 +405,9 @@ void init_irq_proc(void)
        unsigned int irq;
        struct irq_desc *desc;
  
@@ -133,7 +133,7 @@
  }
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -1302,10 +1302,12 @@ static int __init setup_vmstat(void)
+@@ -1303,10 +1303,12 @@ static int __init setup_vmstat(void)
        put_online_cpus();
  #endif
  #ifdef CONFIG_PROC_FS