aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@linaro.org>2014-02-06 10:56:36 +0000
committerSteve Capper <steve.capper@linaro.org>2014-02-06 13:10:42 +0000
commita4271e84e58688b443476c39280032e0524497dd (patch)
tree8235eef5cebe3944ebcecfd9320179700250cce4
parent17f61b5947343384cb2857304d23ff96d18ab6ba (diff)
downloadlinux-3.14-rc1-fixups.tar.gz
arm64: mm: Correct definition of pmd_mknotpresent3.14-rc1-fixups
pmd_mknotpresent currently creates a faulting pmd by clearing the valid bit. Unfortunately pmd_present(.) will report such pmds as being present! This patch re-defines pmd_mknotpresent such that __pmd(0) is returned instead. Signed-off-by: Steve Capper <steve.capper@linaro.org>
-rw-r--r--arch/arm64/include/asm/pgtable.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index a5d58322c51..5d266e4b6e2 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -291,8 +291,7 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd)
static inline pmd_t pmd_mknotpresent(pmd_t pmd)
{
- pmd_val(pmd) &= ~PMD_TYPE_MASK;
- return pmd;
+ return __pmd(0);
}
#define pmd_mkhuge(pmd) (__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))