1 files changed, 6 insertions, 4 deletions

diff --git a/init/main.c b/init/main.c
index febc511e078a..f865261fb096 100644
--- a/init/main.c
+++ b/init/main.c
@@ -355,9 +355,11 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  */
 static void __init setup_command_line(char *command_line)
 {
-        saved_command_line = alloc_bootmem(strlen (boot_command_line)+1);
-        initcall_command_line = alloc_bootmem(strlen (boot_command_line)+1);
-        static_command_line = alloc_bootmem(strlen (command_line)+1);
+        saved_command_line =
+                memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
+        initcall_command_line =
+                memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
+        static_command_line = memblock_virt_alloc(strlen(command_line) + 1, 0);
         strcpy (saved_command_line, boot_command_line);
         strcpy (static_command_line, command_line);
 }
@@ -476,7 +478,7 @@ static void __init mm_init(void)
         mem_init();
         kmem_cache_init();
         percpu_init_late();
-        pgtable_cache_init();
+        pgtable_init();
         vmalloc_init();
 }