2 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8ef2fc9f1f08..b44b4ca82164 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2228,8 +2228,7 @@ extern void __init vfs_caches_init(unsigned long);
 
 extern struct kmem_cache *names_cachep;
 
-#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)   __putname(name)
diff --git a/init/do_mounts.c b/init/do_mounts.c
index d3f0aeed2d39..f8a66424360d 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -353,8 +353,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];
@@ -406,7 +407,7 @@ retry:
 #endif
         panic("VFS: Unable to mount root fs on %s", b);
 out:
-        putname(fs_names);
+        put_page(page);
 }
  
 #ifdef CONFIG_ROOT_NFS