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

Merge the __p[m|u]xdp_idte and __p[m|u]dp_idte_local functions into a
single __p[m|u]dp_idte function with an additional parameter.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 1dc6cad9a5ac..7a1897c51c54 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -301,9 +301,9 @@ static inline pmd_t pmdp_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())))
-                __pmdp_idte_local(addr, pmdp);
+                __pmdp_idte(addr, pmdp, IDTE_LOCAL);
         else
-                __pmdp_idte(addr, pmdp);
+                __pmdp_idte(addr, pmdp, IDTE_GLOBAL);
         atomic_dec(&mm->context.flush_count);
         return old;
 }
@@ -322,7 +322,7 @@ static inline pmd_t pmdp_flush_lazy(struct mm_struct *mm,
                 pmd_val(*pmdp) |= _SEGMENT_ENTRY_INVALID;
                 mm->context.flush_mm = 1;
         } else if (MACHINE_HAS_IDTE)
-                __pmdp_idte(addr, pmdp);
+                __pmdp_idte(addr, pmdp, IDTE_GLOBAL);
         else
                 __pmdp_csp(pmdp);
         atomic_dec(&mm->context.flush_count);
@@ -374,9 +374,9 @@ static inline pud_t pudp_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())))
-                __pudp_idte_local(addr, pudp);
+                __pudp_idte(addr, pudp, IDTE_LOCAL);
         else
-                __pudp_idte(addr, pudp);
+                __pudp_idte(addr, pudp, IDTE_GLOBAL);
         atomic_dec(&mm->context.flush_count);
         return old;
 }