Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption"

[linux-2.6-microblaze.git] / arch / arm64 / mm / hugetlbpage.c

diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index cd8d96e..35e9a46 100644 (file)
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -559,24 +559,3 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
 {
        return __hugetlb_valid_size(size);
 }
-
-pte_t huge_ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
-{
-       if (IS_ENABLED(CONFIG_ARM64_WORKAROUND_2645198) &&
-           cpus_have_const_cap(ARM64_WORKAROUND_2645198)) {
-               /*
-                * Break-before-make (BBM) is required for all user space mappings
-                * when the permission changes from executable to non-executable
-                * in cases where cpu is affected with errata #2645198.
-                */
-               if (pte_user_exec(READ_ONCE(*ptep)))
-                       return huge_ptep_clear_flush(vma, addr, ptep);
-       }
-       return huge_ptep_get_and_clear(vma->vm_mm, addr, ptep);
-}
-
-void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep,
-                                 pte_t old_pte, pte_t pte)
-{
-       set_huge_pte_at(vma->vm_mm, addr, ptep, pte);
-}