summaryrefslogtreecommitdiffstats
path: root/init/do_mounts.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-20 21:15:16 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 12:25:05 -0700
commitbdaf8529385d5126ef791e8f1914afff8cd59bcf (patch)
treeaa9e917703526ad034a19cf1b16002aba486cd17 /init/do_mounts.c
parenta29641883f57f36424e3219ae9ff48dd6cd34de0 (diff)
downloadlinux-bdaf8529385d5126ef791e8f1914afff8cd59bcf.tar.gz
linux-bdaf8529385d5126ef791e8f1914afff8cd59bcf.tar.bz2
linux-bdaf8529385d5126ef791e8f1914afff8cd59bcf.zip
[PATCH] devfs: Remove devfs from the init code
This patch removes the devfs code from the init/ directory. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'init/do_mounts.c')
-rw-r--r--init/do_mounts.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 21b3b8f33a72..94aeec7aa917 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -325,7 +325,7 @@ static int __init mount_nfs_root(void)
{
void *data = nfs_root_data();
- create_dev("/dev/root", ROOT_DEV, NULL);
+ create_dev("/dev/root", ROOT_DEV);
if (data &&
do_mount_root("/dev/root", "nfs", root_mountflags, data) == 0)
return 1;
@@ -386,7 +386,7 @@ void __init mount_root(void)
change_floppy("root floppy");
}
#endif
- create_dev("/dev/root", ROOT_DEV, root_device_name);
+ create_dev("/dev/root", ROOT_DEV);
mount_block_root("/dev/root", root_mountflags);
}
@@ -397,8 +397,6 @@ void __init prepare_namespace(void)
{
int is_floppy;
- mount_devfs();
-
if (root_delay) {
printk(KERN_INFO "Waiting %dsec before mounting root device...\n",
root_delay);
@@ -428,10 +426,8 @@ void __init prepare_namespace(void)
mount_root();
out:
- umount_devfs("/dev");
sys_mount(".", "/", NULL, MS_MOVE, NULL);
sys_chroot(".");
security_sb_post_mountroot();
- mount_devfs_fs ();
}