summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2015-06-30 18:04:49 +0200
committerCatalin Marinas <catalin.marinas@arm.com>2015-06-30 18:03:37 +0100
commit1e43ba9cd867f05f3e85579c370b939e1ce585e9 (patch)
treebc85363344d0cc82c71763f4fe7c0a1e7a158248 /arch
parent2341c0234731f5a6ea0b403f3dc14d1841b8e247 (diff)
downloadlinux-stable-1e43ba9cd867f05f3e85579c370b939e1ce585e9.tar.gz
linux-stable-1e43ba9cd867f05f3e85579c370b939e1ce585e9.tar.bz2
linux-stable-1e43ba9cd867f05f3e85579c370b939e1ce585e9.zip
arm64: fix incorrect use of pgprot_t variable
This fixes a build failure under STRICT_MM_TYPECHECKS, by adding a missing pgprot_val() around a pgport_t reference. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/mm/mmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 82d3435bf14f..a4ede4e2ddd1 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -117,7 +117,7 @@ void split_pud(pud_t *old_pud, pmd_t *pmd)
int i = 0;
do {
- set_pmd(pmd, __pmd(addr | prot));
+ set_pmd(pmd, __pmd(addr | pgprot_val(prot)));
addr += PMD_SIZE;
} while (pmd++, i++, i < PTRS_PER_PMD);
}