projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[S390] dasd deadlock after state change pending interrupt.
[powerpc.git]
/
init
/
do_mounts.c
diff --git
a/init/do_mounts.c
b/init/do_mounts.c
index
21b3b8f
..
94aeec7
100644
(file)
--- 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();
{
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;
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
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);
}
mount_block_root("/dev/root", root_mountflags);
}
@@
-397,8
+397,6
@@
void __init prepare_namespace(void)
{
int is_floppy;
{
int is_floppy;
- mount_devfs();
-
if (root_delay) {
printk(KERN_INFO "Waiting %dsec before mounting root device...\n",
root_delay);
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:
mount_root();
out:
- umount_devfs("/dev");
sys_mount(".", "/", NULL, MS_MOVE, NULL);
sys_chroot(".");
security_sb_post_mountroot();
sys_mount(".", "/", NULL, MS_MOVE, NULL);
sys_chroot(".");
security_sb_post_mountroot();
- mount_devfs_fs ();
}
}