summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2014-06-05 01:12:20 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-05 01:54:21 +0200
commit647f010bff6795b3e85c2b5a7768c0594a049ab0 (patch)
treeff70d138185e71e07fc0a29a88eb42d76d265178 /init/main.c
parentkthreads: kill CLONE_KERNEL, change kernel_thread(kernel_init) to avoid CLONE... (diff)
downloadlinux-647f010bff6795b3e85c2b5a7768c0594a049ab0.tar.xz
linux-647f010bff6795b3e85c2b5a7768c0594a049ab0.zip
init/main.c: remove an ifdef
Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c2
1 files changed, 0 insertions, 2 deletions
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();