diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-11-09 09:55:45 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-11-09 14:23:16 +0000 |
| commit | b219545e9646e9d4089a74029c82ae59645e12ae (patch) | |
| tree | a838127df77d75c34c92f9cf39d6b6724f19b298 /arch/arm64/mm/mmu.c | |
| parent | 14e589ff4aa3f28a5424e92b6495ecb8950080f7 (diff) | |
| download | linux-b219545e9646e9d4089a74029c82ae59645e12ae.tar.gz linux-b219545e9646e9d4089a74029c82ae59645e12ae.tar.bz2 linux-b219545e9646e9d4089a74029c82ae59645e12ae.zip | |
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>
Diffstat (limited to 'arch/arm64/mm/mmu.c')
| -rw-r--r-- | arch/arm64/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index c2fa6b56613c..2784f052df5e 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -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 |