From 5d6c838cabe3cb410d02cbae50eda6857a8b6b29 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 18 Feb 2013 17:51:20 +0100 Subject: [PATCH] --- yaml --- r: 360618 b: refs/heads/master c: 69dde4c52dbac2891b49ff9723d9c84efc5baf6f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/pgtable.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3bbf4ea41a90..6dabae5dd645 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70264367a243a68b1d5636ffb570183449803cbe +refs/heads/master: 69dde4c52dbac2891b49ff9723d9c84efc5baf6f diff --git a/trunk/arch/arm/include/asm/pgtable.h b/trunk/arch/arm/include/asm/pgtable.h index 9c82f988c0e3..c09474942f3e 100644 --- a/trunk/arch/arm/include/asm/pgtable.h +++ b/trunk/arch/arm/include/asm/pgtable.h @@ -240,7 +240,8 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { - const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | L_PTE_NONE; + const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | + L_PTE_NONE | L_PTE_VALID; pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask); return pte; }