aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 *);
44 44
45#else /* CONFIG_PROC_FS */ 45#else /* CONFIG_PROC_FS */
46 46
47static inline void proc_root_init(void)
48{
49}
50
47static inline void proc_flush_task(struct task_struct *task) 51static inline void proc_flush_task(struct task_struct *task)
48{ 52{
49} 53}
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)
629 signals_init(); 629 signals_init();
630 /* rootfs populating might need page-writeback */ 630 /* rootfs populating might need page-writeback */
631 page_writeback_init(); 631 page_writeback_init();
632#ifdef CONFIG_PROC_FS
633 proc_root_init(); 632 proc_root_init();
634#endif
635 cgroup_init(); 633 cgroup_init();
636 cpuset_init(); 634 cpuset_init();
637 taskstats_init_early(); 635 taskstats_init_early();