Commit b219545e authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Catalin Marinas

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: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 14e589ff
...@@ -146,7 +146,7 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr, ...@@ -146,7 +146,7 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr,
if (((addr | next | phys) & ~CONT_MASK) == 0) { if (((addr | next | phys) & ~CONT_MASK) == 0) {
/* a block of CONT_PTES */ /* a block of CONT_PTES */
__populate_init_pte(pte, addr, next, phys, __populate_init_pte(pte, addr, next, phys,
prot | __pgprot(PTE_CONT)); __pgprot(pgprot_val(prot) | PTE_CONT));
} else { } else {
/* /*
* If the range being split is already inside of a * If the range being split is already inside of a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment