2 files changed, 8 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 7260b27ebbab..f0c2e681b506 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1136,6 +1136,7 @@ endif # CGROUPS
 
 config CHECKPOINT_RESTORE
         bool "Checkpoint/restore support" if EXPERT
+        select PROC_CHILDREN
         default n
         help
           Enables additional kernel features in a sake of checkpoint/restore.
diff --git a/init/do_mounts.c b/init/do_mounts.c
index a95bbdb2a502..dea5de95c2dd 100644
--- 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
 }