Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[profile/ivi/kernel-adaptation-intel-automotive.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index d3f0aee..f8a6642 100644 (file)
--- 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