From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Tue, 30 Jun 2015 16:04:49 +0000 (+0200)
Subject: arm64: fix incorrect use of pgprot_t variable
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e43ba9cd867f05f3e85579c370b939e1ce585e9;p=linux-beck.git

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>
---

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);
 }