diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-26 16:20:44 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-26 16:20:44 +1000 |
commit | 89f42ca1fd21feb5e07838b6b219c21e48a7b5da (patch) | |
tree | 18b1140bd2f24e9871a93c18ab7c792f6b32e1f7 /init | |
parent | 3359defa4737effc9eb2226d90d4833003461d68 (diff) | |
parent | 76d0e31a920881e8284f6f0fae4ef79566d7a9be (diff) |
Merge branch 'quilt/driver-core'
Conflicts:
drivers/base/class.c
init/main.c
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) mount_root(); out: + devtmpfs_mount("dev"); sys_mount(".", "/", NULL, MS_MOVE, NULL); sys_chroot("."); } - diff --git a/init/main.c b/init/main.c index 8a5b3c6c99d3..f5ffedad383e 100644 --- a/init/main.c +++ b/init/main.c @@ -69,6 +69,7 @@ #include <linux/kmemcheck.h> #include <linux/kmemtrace.h> #include <linux/sfi.h> +#include <linux/shmem_fs.h> #include <trace/boot.h> #include <asm/io.h> @@ -782,6 +783,7 @@ static void __init do_basic_setup(void) init_workqueues(); cpuset_init_smp(); usermodehelper_init(); + init_tmpfs(); driver_init(); init_irq_proc(); do_ctors(); |