target/linux: sync 3.18 & 4.1 linux kernels to upstream

diff --git a/target/linux/generic/patches-4.1/902-debloat_proc.patch b/target/linux/generic/patches-4.1/902-debloat_proc.patch
index b0dce818b507e095792fb4e4e416d2ea94606978..d8c52addbfd93ba2604a4fa919d16b6255452455 100644 (file)
--- a/target/linux/generic/patches-4.1/902-debloat_proc.patch
+++ b/target/linux/generic/patches-4.1/902-debloat_proc.patch
@@ -109,17 +109,6 @@
        /* create /proc/irq */
        root_irq_dir = proc_mkdir("irq", NULL);
        if (!root_irq_dir)
---- a/kernel/time/timer_list.c
-+++ b/kernel/time/timer_list.c
-@@ -388,6 +388,8 @@ static int __init init_timer_list_procfs
- {
-       struct proc_dir_entry *pe;
- 
-+      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
-+              return 0;
-       pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
-       if (!pe)
-               return -ENOMEM;
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
 @@ -2683,6 +2683,8 @@ static const struct file_operations proc