From c6d2a6b5197be2a1249a39506dd2bac1fe9bca9d Mon Sep 17 00:00:00 2001 From: acoul Date: Tue, 29 Mar 2016 07:44:23 +0300 Subject: [PATCH] linux/generic: sync kernel 4.1 patches to upstream --- .../linux/generic/patches-4.1/902-debloat_proc.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 d8c52addbf..b0dce818b5 100644 --- a/target/linux/generic/patches-4.1/902-debloat_proc.patch +++ b/target/linux/generic/patches-4.1/902-debloat_proc.patch @@ -109,6 +109,17 @@ /* 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 -- 2.35.1