wimax: replace uses of __constant_{endian}

[safe/jmp/linux-2.6] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3715feb..708105e 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/initrd.h>
+#include <linux/async.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -220,10 +221,10 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
 
        sys_chdir("/root");
        ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
-       printk("VFS: Mounted root (%s filesystem)%s.\n",
+       printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
               current->fs->pwd.mnt->mnt_sb->s_type->name,
               current->fs->pwd.mnt->mnt_sb->s_flags & MS_RDONLY ?
-              " readonly" : "");
+              " readonly" : "", MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
        return 0;
 }
 
@@ -263,6 +264,10 @@ retry:
                printk("Please append a correct \"root=\" boot option; here are the available partitions:\n");
 
                printk_all_partitions();
+#ifdef CONFIG_DEBUG_BLOCK_EXT_DEVT
+               printk("DEBUG_BLOCK_EXT_DEVT is enabled, you need to specify "
+                      "explicit textual name for \"root=\" boot option.\n");
+#endif
                panic("VFS: Unable to mount root fs on %s", b);
        }
 
@@ -368,6 +373,7 @@ void __init prepare_namespace(void)
        /* wait for the known devices to complete their probing */
        while (driver_probe_done() != 0)
                msleep(100);
+       async_synchronize_full();
 
        md_run_setup();