aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@linaro.org>2013-11-19 16:19:36 +0000
committerSteve Capper <steve.capper@linaro.org>2013-12-10 08:22:46 +0000
commitb6c8640c709c09e68b19fb842118808bf77e9750 (patch)
tree7bc0fe3957a4ac59eb7fd7dc3d553d2a8bffaae4
parent97c7796e80231ae933fa7a2f7de472165c70e989 (diff)
downloadlinux-b6c8640c709c09e68b19fb842118808bf77e9750.tar.gz
ARM: mm: Make LPAE huge page ptes NG by default
Rather than set the NG bit as we write the huge page entry, set it on huge page entry creation. This simplifies code, and obviates the need for us to override pte_same. Signed-off-by: Steve Capper <steve.capper@linaro.org>
-rw-r--r--arch/arm/include/asm/pgtable-3level.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index 5689c18c85f..d1318e11cd4 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -199,7 +199,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
#define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,__pte(pte_val(pte)|(ext)))
#define pte_huge(pte) (pte_val(pte) && !(pte_val(pte) & PTE_TABLE_BIT))
-#define pte_mkhuge(pte) (__pte(pte_val(pte) & ~PTE_TABLE_BIT))
+#define pte_mkhuge(pte) (__pte((pte_val(pte) & ~PTE_TABLE_BIT) | PTE_EXT_NG))
#define pmd_young(pmd) (pmd_val(pmd) & PMD_SECT_AF)