1 files changed, 6 insertions, 4 deletions

diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 1e52e97d7409..6ef63caca682 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -19,6 +19,8 @@
  *
  */
 
+#undef DEBUG
+
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -208,12 +210,12 @@ static int __meminit vmemmap_populated(unsigned long start, int page_size)
 }
 
 int __meminit vmemmap_populate(struct page *start_page,
-                                        unsigned long nr_pages, int node)
+                               unsigned long nr_pages, int node)
 {
         unsigned long mode_rw;
         unsigned long start = (unsigned long)start_page;
         unsigned long end = (unsigned long)(start_page + nr_pages);
-        unsigned long page_size = 1 << mmu_psize_defs[mmu_linear_psize].shift;
+        unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;
 
         mode_rw = _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX;
 
@@ -235,11 +237,11 @@ int __meminit vmemmap_populate(struct page *start_page,
                         start, p, __pa(p));
 
                 mapped = htab_bolt_mapping(start, start + page_size,
-                                        __pa(p), mode_rw, mmu_linear_psize,
+                                        __pa(p), mode_rw, mmu_vmemmap_psize,
                                         mmu_kernel_ssize);
                 BUG_ON(mapped < 0);
         }
 
         return 0;
 }
-#endif
+#endif /* CONFIG_SPARSEMEM_VMEMMAP */