Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes

[~andy/linux] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index dd7ee5f203f3f9c476a92d9ef39257a2791b132f..bb008d064c1a53c711bc9c0b7ae21e26797a9b24 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -231,7 +231,8 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
 
 void __init mount_block_root(char *name, int flags)
 {
-       char *fs_names = __getname();
+       char *fs_names = __getname_gfp(GFP_KERNEL
+               | __GFP_NOTRACK_FALSE_POSITIVE);
        char *p;
 #ifdef CONFIG_BLOCK
        char b[BDEVNAME_SIZE];
@@ -414,7 +415,7 @@ void __init prepare_namespace(void)
 
        mount_root();
 out:
+       devtmpfs_mount("dev");
        sys_mount(".", "/", NULL, MS_MOVE, NULL);
        sys_chroot(".");
 }
-