aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@linaro.org>2013-11-19 15:40:33 +0000
committerSteve Capper <steve.capper@linaro.org>2013-12-10 08:22:46 +0000
commitdccd1fc3dad553b7f0b1a5d96db9f8d0b3e2ea90 (patch)
tree1273b1358d7a775508c037c4441d53b506b30e22
parentb6c8640c709c09e68b19fb842118808bf77e9750 (diff)
downloadlinux-arm/hugepage_fixes.tar.gz
Revert "ARM: mm: correct pte_same behaviour for LPAE."arm/hugepage_fixes
This reverts commit dde1b65110353517816bcbc58539463396202244. We no longer need to override pte_same for LPAE, as we set the NG bit on huge pte creation. Signed-off-by: Steve Capper <steve.capper@linaro.org>
-rw-r--r--arch/arm/include/asm/pgtable-3level.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index d1318e11cd4..7f3fa994f50 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -179,23 +179,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
clean_pmd_entry(pmdp); \
} while (0)
-/*
- * For 3 levels of paging the PTE_EXT_NG bit will be set for user address ptes
- * that are written to a page table but not for ptes created with mk_pte.
- *
- * In hugetlb_no_page, a new huge pte (new_pte) is generated and passed to
- * hugetlb_cow, where it is compared with an entry in a page table.
- * This comparison test fails erroneously leading ultimately to a memory leak.
- *
- * To correct this behaviour, we mask off PTE_EXT_NG for any pte that is
- * present before running the comparison.
- */
-#define __HAVE_ARCH_PTE_SAME
-#define pte_same(pte_a,pte_b) ((pte_present(pte_a) ? pte_val(pte_a) & ~PTE_EXT_NG \
- : pte_val(pte_a)) \
- == (pte_present(pte_b) ? pte_val(pte_b) & ~PTE_EXT_NG \
- : pte_val(pte_b)))
-
#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))