diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts.c | 2 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 093f65915501..bb008d064c1a 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
@@ -415,7 +415,7 @@ void __init prepare_namespace(void) | |||
415 | 415 | ||
416 | mount_root(); | 416 | mount_root(); |
417 | out: | 417 | out: |
418 | devtmpfs_mount("dev"); | ||
418 | sys_mount(".", "/", NULL, MS_MOVE, NULL); | 419 | sys_mount(".", "/", NULL, MS_MOVE, NULL); |
419 | sys_chroot("."); | 420 | sys_chroot("."); |
420 | } | 421 | } |
421 | |||
diff --git a/init/main.c b/init/main.c index 63904bb6ae37..34971becbd3c 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -68,6 +68,7 @@ | |||
68 | #include <linux/async.h> | 68 | #include <linux/async.h> |
69 | #include <linux/kmemcheck.h> | 69 | #include <linux/kmemcheck.h> |
70 | #include <linux/kmemtrace.h> | 70 | #include <linux/kmemtrace.h> |
71 | #include <linux/shmem_fs.h> | ||
71 | #include <trace/boot.h> | 72 | #include <trace/boot.h> |
72 | 73 | ||
73 | #include <asm/io.h> | 74 | #include <asm/io.h> |
@@ -785,6 +786,7 @@ static void __init do_basic_setup(void) | |||
785 | init_workqueues(); | 786 | init_workqueues(); |
786 | cpuset_init_smp(); | 787 | cpuset_init_smp(); |
787 | usermodehelper_init(); | 788 | usermodehelper_init(); |
789 | init_tmpfs(); | ||
788 | driver_init(); | 790 | driver_init(); |
789 | init_irq_proc(); | 791 | init_irq_proc(); |
790 | do_ctors(); | 792 | do_ctors(); |