From b9d51a0b437e08fbce76cfc57a1151594672e62c Mon Sep 17 00:00:00 2001 From: Shiraz Hashim Date: Sat, 12 Sep 2015 11:57:31 +0530 Subject: [PATCH] arm64: mm: skip 1GB mappings on force pages While force mapping regions as page, do not go for 1GB block mapping. Change-Id: I85ca7046626048acb7a138dc174dc40efbba4ac9 Signed-off-by: Shiraz Hashim --- arch/arm64/mm/mmu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 79a5bd0b21dd..e82aabb3c5e2 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -218,6 +218,7 @@ static void alloc_init_pud(struct mm_struct *mm, pgd_t *pgd, * For 4K granule only, attempt to put down a 1GB block */ if (use_1G_block(addr, next, phys) && + !force_pages && !dma_overlap(phys, phys + next - addr) && !IS_ENABLED(CONFIG_FORCE_PAGES)) { pud_t old_pud = *pud;