1 files changed, 1 insertions, 11 deletions

diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index f28c43d2f61d..a4d856db9154 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -13,7 +13,6 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
                                    pte_t *pteptr, pte_t pteval)
 {
         pmd_t *pmdp = (pmd_t *) pteptr;
-        pte_t shadow_pteval = pteval;
         unsigned long mask;
 
         if (!MACHINE_HAS_HPAGE) {
@@ -21,18 +20,9 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
                 mask = pte_val(pteval) &
                                 (_SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO);
                 pte_val(pteval) = (_SEGMENT_ENTRY + __pa(pteptr)) | mask;
-                if (mm->context.noexec) {
-                        pteptr += PTRS_PER_PTE;
-                        pte_val(shadow_pteval) =
-                                        (_SEGMENT_ENTRY + __pa(pteptr)) | mask;
-                }
         }
 
         pmd_val(*pmdp) = pte_val(pteval);
-        if (mm->context.noexec) {
-                pmdp = get_shadow_table(pmdp);
-                pmd_val(*pmdp) = pte_val(shadow_pteval);
-        }
 }
 
 int arch_prepare_hugepage(struct page *page)
@@ -68,7 +58,7 @@ void arch_release_hugepage(struct page *page)
         ptep = (pte_t *) page[1].index;
         if (!ptep)
                 return;
-        pte_free(&init_mm, ptep);
+        page_table_free(&init_mm, (unsigned long *) ptep);
         page[1].index = 0;
 }