powerpc/mm/hash/4k: Don't use 64K page size for vmemmap with 4K pagesize

With hash translation and 4K PAGE_SIZE config, we need to make sure we don't
use 64K page size for vmemmap.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
index 1ff451892d7fa8817a9f9051f203b793f24d4096..25a2cf32d544a684fcfdcb8eeea087bcd40e5d62 100644 (file)
--- a/arch/powerpc/mm/book3s64/hash_utils.c
+++ b/arch/powerpc/mm/book3s64/hash_utils.c
@@ -688,10 +688,8 @@ static void __init htab_init_page_sizes(void)
        if (mmu_psize_defs[MMU_PAGE_16M].shift &&
            memblock_phys_mem_size() >= 0x40000000)
                mmu_vmemmap_psize = MMU_PAGE_16M;
-       else if (mmu_psize_defs[MMU_PAGE_64K].shift)
-               mmu_vmemmap_psize = MMU_PAGE_64K;
        else
-               mmu_vmemmap_psize = MMU_PAGE_4K;
+               mmu_vmemmap_psize = mmu_virtual_psize;
 #endif /* CONFIG_SPARSEMEM_VMEMMAP */
 
        printk(KERN_DEBUG "Page orders: linear mapping = %d, "