From d1e941b826f95471d02b65429bf422faa8b9e035 Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Sat, 16 May 2009 11:26:20 +0200
Subject: [PATCH] --- yaml --- r: 151477 b: refs/heads/master c:
 3b5c760efcddf1ebdd39a2035b554e96febd7466 h: refs/heads/master i:   151475:
 c677924aa22ce0b0e5ffc52334cc92d557390a9a v: v3

---
 [refs]                 | 2 +-
 trunk/init/do_mounts.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7a724db5f024..9bb06f66dd55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3446a8aa7ebcbc0a799e5e8fc4f2da0738d6bc21
+refs/heads/master: 3b5c760efcddf1ebdd39a2035b554e96febd7466
diff --git a/trunk/init/do_mounts.c b/trunk/init/do_mounts.c
index dd7ee5f203f3..093f65915501 100644
--- a/trunk/init/do_mounts.c
+++ b/trunk/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];