summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2014-06-05 03:12:20 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-05 03:54:21 +0400
commit647f010bff6795b3e85c2b5a7768c0594a049ab0 (patch)
treeff70d138185e71e07fc0a29a88eb42d76d265178
parent34a1b7236ad6113883f6c448d1da854cad60265e (diff)
downloadlinux-647f010bff6795b3e85c2b5a7768c0594a049ab0.tar.xz
init/main.c: remove an ifdef
Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/proc_fs.h4
-rw-r--r--init/main.c2
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 4de815c0309a..17d47bcdf573 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();