Commit b219545e authored Nov 09, 2015 by Ard Biesheuvel Committed by Catalin Marinas Nov 09, 2015

arm64: fix STRICT_MM_TYPECHECKS issue in PTE_CONT manipulation

The new page table code that manipulates the PTE_CONT flags does so
in a way that is inconsistent with STRICT_MM_TYPECHECKS. Fix it by
using the correct combination of __pgprot() and pgprot_val().

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

parent 14e589ff

arch/arm64/mm/mmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr,
		if (((addr \| next \| phys) & ~CONT_MASK) == 0) {
		/* a block of CONT_PTES */
		__populate_init_pte(pte, addr, next, phys,
		prot \| __pgprot(PTE_CONT));
		__pgprot(pgprot_val(prot) \| PTE_CONT));
		} else {
		/*
		* If the range being split is already inside of a