aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-11 21:49:57 +0100
committerMark Brown <broonie@linaro.org>2014-08-11 21:49:57 +0100
commit7c6c08d531ecea6c3c314591b319e42a42405101 (patch)
treeefd973071f1ad8713144ce224fc84ad8203e9bd1
parentc219bc7f665dd28714bed6986fe6d52ef6c782c0 (diff)
arm64: Fix up earlier backport
Crept in during a cherry-pick run; ideally should be squished down. Signed-off-by: Mark Brown <broonie@linaro.org>
-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 37d02a863c0e..ad70f0ee1976 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -168,7 +168,7 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
PMD_ATTRINDX(MT_DEVICE_nGnRE);
prot_pte = __pgprot(PROT_DEVICE_nGnRE);
} else {
- prot_sect = prot_sect_kernel;
+ prot_sect = PROT_SECT_NORMAL_EXEC;
prot_pte = PAGE_KERNEL_EXEC;
}