diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6c34da9370cf..8e878bd0546b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2128,8 +2128,7 @@ extern struct kmem_cache *names_cachep;
 
 extern void final_putname(struct filename *name);
 
-#define __getname_gfp(gfp)	kmem_cache_alloc(names_cachep, (gfp))
-#define __getname()		__getname_gfp(GFP_KERNEL)
+#define __getname()		kmem_cache_alloc(names_cachep, GFP_KERNEL)
 #define __putname(name)		kmem_cache_free(names_cachep, (void *)(name))
 #ifndef CONFIG_AUDITSYSCALL
 #define putname(name)		final_putname(name)
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 42b0707c3481..7442d6d2d5f6 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -343,8 +343,9 @@ 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_gfp(GFP_KERNEL
-		| __GFP_NOTRACK_FALSE_POSITIVE);
+	struct page *page = alloc_page(GFP_KERNEL |
+					__GFP_NOTRACK_FALSE_POSITIVE);
+	char *fs_names = page_address(page);
 	char *p;
 #ifdef CONFIG_BLOCK
 	char b[BDEVNAME_SIZE];
@@ -396,7 +397,7 @@ retry:
 #endif
 	panic("VFS: Unable to mount root fs on %s", b);
 out:
-	putname(fs_names);
+	put_page(page);
 }
  
 #ifdef CONFIG_ROOT_NFS