Merge branch 'for-linus' of git://neil.brown.name/md

[pandora-kernel.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index dd7ee5f..093f659 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];