diff options
authorCatalin Marinas <catalin.marinas@arm.com>2019-11-06 15:41:05 +0000
committerWill Deacon <will@kernel.org>2019-11-06 19:31:56 +0000
commit6767df245f4736d0cf0c6fb7cf9cf94b27414245 (patch)
parentarm64: apply ARM64_ERRATUM_843419 workaround for Brahma-B53 core (diff)
arm64: Do not mask out PTE_RDONLY in pte_same()
Following commit 73e86cb03cf2 ("arm64: Move PTE_RDONLY bit handling out of set_pte_at()"), the PTE_RDONLY bit is no longer managed by set_pte_at() but built into the PAGE_* attribute definitions. Consequently, pte_same() must include this bit when checking two PTEs for equality. Remove the arm64-specific pte_same() function, practically reverting commit 747a70e60b72 ("arm64: Fix copy-on-write referencing in HugeTLB") Fixes: 73e86cb03cf2 ("arm64: Move PTE_RDONLY bit handling out of set_pte_at()") Cc: <stable@vger.kernel.org> # 4.14.x- Cc: Will Deacon <will@kernel.org> Cc: Steve Capper <steve.capper@arm.com> Reported-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Will Deacon <will@kernel.org>
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index 8330810f699e..565aa45ef134 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -283,23 +283,6 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
set_pte(ptep, pte);
-static inline int pte_same(pte_t pte_a, pte_t pte_b)
- pteval_t lhs, rhs;
- lhs = pte_val(pte_a);
- rhs = pte_val(pte_b);
- if (pte_present(pte_a))
- lhs &= ~PTE_RDONLY;
- if (pte_present(pte_b))
- rhs &= ~PTE_RDONLY;
- return (lhs == rhs);
* Huge pte definitions.