Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78c94988 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

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: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b8c8a524

arch/powerpc/mm/book3s64/hash_utils.c

+1 −3
Original line number Diff line number Diff line
@@ -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, "