s390/mm: merge local / non-local IPTE helper

Merge the __ptep_ipte and __ptep_ipte_local functions into a single
__ptep_ipte function with an additional parameter. The __pte_ipte_range
function is still extra as the while loops makes it hard to merge.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index af7cf28cf97e..44f150312a16 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -309,11 +309,11 @@ static void ipte_range(pte_t *pte, unsigned long address, int nr)
         int i;
 
         if (test_facility(13)) {
-                __ptep_ipte_range(address, nr - 1, pte);
+                __ptep_ipte_range(address, nr - 1, pte, IPTE_GLOBAL);
                 return;
         }
         for (i = 0; i < nr; i++) {
-                __ptep_ipte(address, pte);
+                __ptep_ipte(address, pte, IPTE_GLOBAL);
                 address += PAGE_SIZE;
                 pte++;
         }
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 5f092015aaa7..1dc6cad9a5ac 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -35,9 +35,9 @@ static inline pte_t ptep_flush_direct(struct mm_struct *mm,
         atomic_inc(&mm->context.flush_count);
         if (MACHINE_HAS_TLB_LC &&
             cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id())))
-                __ptep_ipte_local(addr, ptep);
+                __ptep_ipte(addr, ptep, IPTE_LOCAL);
         else
-                __ptep_ipte(addr, ptep);
+                __ptep_ipte(addr, ptep, IPTE_GLOBAL);
         atomic_dec(&mm->context.flush_count);
         return old;
 }
@@ -56,7 +56,7 @@ static inline pte_t ptep_flush_lazy(struct mm_struct *mm,
                 pte_val(*ptep) |= _PAGE_INVALID;
                 mm->context.flush_mm = 1;
         } else
-                __ptep_ipte(addr, ptep);
+                __ptep_ipte(addr, ptep, IPTE_GLOBAL);
         atomic_dec(&mm->context.flush_count);
         return old;
 }
@@ -620,7 +620,7 @@ bool test_and_clear_guest_dirty(struct mm_struct *mm, unsigned long addr)
         pte = *ptep;
         if (dirty && (pte_val(pte) & _PAGE_PRESENT)) {
                 pgste = pgste_pte_notify(mm, addr, ptep, pgste);
-                __ptep_ipte(addr, ptep);
+                __ptep_ipte(addr, ptep, IPTE_GLOBAL);
                 if (MACHINE_HAS_ESOP || !(pte_val(pte) & _PAGE_WRITE))
                         pte_val(pte) |= _PAGE_PROTECT;
                 else