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

Commit c9f349b1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: mm: Do not create 1GB mappings if FORCE_PAGES is enabled"

parents 72d9f991 2528a04c

arch/arm64/mm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -378,7 +378,8 @@ 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) &&

				!dma_overlap(phys, phys + next - addr)) {

				!dma_overlap(phys, phys + next - addr) &&

				!IS_ENABLED(CONFIG_FORCE_PAGES)) {

			pud_t old_pud = *pud;

			set_pud(pud, __pud(phys |

					   pgprot_val(mk_sect_prot(prot))));