From fd5a1ef247a1d57052fb2ac9f5bbce12b0f75f7f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 14 May 2014 10:02:36 +1000 Subject: [PATCH] init/main.c: remove an ifdef Signed-off-by: Andrew Morton --- include/linux/proc_fs.h | 4 ++++ init/main.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 608e60a74c3c..9d117f61d976 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -44,6 +44,10 @@ extern int remove_proc_subtree(const char *, struct proc_dir_entry *); #else /* CONFIG_PROC_FS */ +static inline void proc_root_init(void) +{ +} + static inline void proc_flush_task(struct task_struct *task) { } diff --git a/init/main.c b/init/main.c index 155976ff912c..d4364d4c9ce3 100644 --- a/init/main.c +++ b/init/main.c @@ -629,9 +629,7 @@ asmlinkage __visible void __init start_kernel(void) signals_init(); /* rootfs populating might need page-writeback */ page_writeback_init(); -#ifdef CONFIG_PROC_FS proc_root_init(); -#endif cgroup_init(); cpuset_init(); taskstats_init_early(); -- 2.39.5