Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index a95bbdb2a50232224eb64c5331123701ea7c2416..dea5de95c2dd23771f44e58ada2d9b1dbfa1c5df 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -533,8 +533,13 @@ void __init mount_root(void)
        }
 #endif
 #ifdef CONFIG_BLOCK
-       create_dev("/dev/root", ROOT_DEV);
-       mount_block_root("/dev/root", root_mountflags);
+       {
+               int err = create_dev("/dev/root", ROOT_DEV);
+
+               if (err < 0)
+                       pr_emerg("Failed to create /dev/root: %d\n", err);
+               mount_block_root("/dev/root", root_mountflags);
+       }
 #endif
 }