kernel: bump 4.14 to 4.14.148

[openwrt/openwrt.git] / target / linux / generic / hack-4.14 / 902-debloat_proc.patch

diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch
index 99e3b5e3445e3718136d1ba35a44b1c9f74b9280..6a2e6175a74feecca8f376bdcec47ae17edf3ac2 100644 (file)
--- a/target/linux/generic/hack-4.14/902-debloat_proc.patch
+++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch
@@ -221,7 +221,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (!root_irq_dir)
 --- a/kernel/time/timer_list.c
 +++ b/kernel/time/timer_list.c
        if (!root_irq_dir)
 --- a/kernel/time/timer_list.c
 +++ b/kernel/time/timer_list.c

-@@ -389,6 +389,8 @@ static int __init init_timer_list_procfs
+@@ -390,6 +390,8 @@ static int __init init_timer_list_procfs

  {
        struct proc_dir_entry *pe;
  
  {
        struct proc_dir_entry *pe;
  


@@ -232,7 +232,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                return -ENOMEM;
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
                return -ENOMEM;
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c

-@@ -2774,6 +2774,8 @@ static const struct file_operations proc
+@@ -2783,6 +2783,8 @@ static const struct file_operations proc

  
  static int __init proc_vmalloc_init(void)
  {
  
  static int __init proc_vmalloc_init(void)
  {


@@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  }
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
  }
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c

-@@ -1955,10 +1955,12 @@ void __init init_mm_internals(void)
+@@ -1950,10 +1950,12 @@ void __init init_mm_internals(void)

        start_shepherd_timer();
  #endif
  #ifdef CONFIG_PROC_FS
        start_shepherd_timer();
  #endif
  #ifdef CONFIG_PROC_FS


@@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c

-@@ -3382,6 +3382,8 @@ static __net_initdata struct pernet_oper
+@@ -3384,6 +3384,8 @@ static __net_initdata struct pernet_oper

  
  static int __init proto_init(void)
  {
  
  static int __init proto_init(void)
  {


@@ -381,7 +381,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/ipv4/proc.c
 +++ b/net/ipv4/proc.c
  
 --- a/net/ipv4/proc.c
 +++ b/net/ipv4/proc.c

-@@ -558,6 +558,9 @@ static __net_initdata struct pernet_oper
+@@ -559,6 +559,9 @@ static __net_initdata struct pernet_oper

  
  int __init ip_misc_proc_init(void)
  {
  
  int __init ip_misc_proc_init(void)
  {