[media] v4l2: mem2mem: save irq flags correctly

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

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 0e93f92..e842840 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -472,7 +472,7 @@ void __init change_floppy(char *fmt, ...)
 void __init mount_root(void)
 {
 #ifdef CONFIG_ROOT_NFS
-       if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) {
+       if (ROOT_DEV == Root_NFS) {
                if (mount_nfs_root())
                        return;
 
@@ -511,6 +511,7 @@ void __init prepare_namespace(void)
                ssleep(root_delay);
        }
 
+#if 0
        /*
         * wait for the known devices to complete their probing
         *
@@ -519,8 +520,11 @@ void __init prepare_namespace(void)
         * for the touchpad of a laptop to initialize.
         */
        wait_for_device_probe();
+#endif
+       async_synchronize_full();
 
        md_run_setup();
+       dm_run_setup();
 
        if (saved_root_name[0]) {
                root_device_name = saved_root_name;