2 files changed, 3 insertions, 4 deletions

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 30eb6d02ddb8..94b8ba2ec857 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -50,7 +50,6 @@ EXPORT_SYMBOL(empty_zero_page);
  */
 void __init paging_init(void)
 {
-        static const int ssm_mask = 0x04000000L;
         unsigned long max_zone_pfns[MAX_NR_ZONES];
         unsigned long pgd_type;
 
@@ -72,7 +71,7 @@ void __init paging_init(void)
         __ctl_load(S390_lowcore.kernel_asce, 1, 1);
         __ctl_load(S390_lowcore.kernel_asce, 7, 7);
         __ctl_load(S390_lowcore.kernel_asce, 13, 13);
-        __raw_local_irq_ssm(ssm_mask);
+        arch_local_irq_restore(4UL << (BITS_PER_LONG - 8));
 
         atomic_set(&init_mm.context.attach_count, 1);
 
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
index a8c2af8c650f..71a4b0d34be0 100644
--- a/arch/s390/mm/maccess.c
+++ b/arch/s390/mm/maccess.c
@@ -71,7 +71,7 @@ int memcpy_real(void *dest, void *src, size_t count)
 
         if (!count)
                 return 0;
-        flags = __raw_local_irq_stnsm(0xf8UL);
+        flags = __arch_local_irq_stnsm(0xf8UL);
         asm volatile (
                 "0:     mvcle   %1,%2,0x0\n"
                 "1:     jo      0b\n"
@@ -82,6 +82,6 @@ int memcpy_real(void *dest, void *src, size_t count)
                   "+d" (_len2), "=m" (*((long *) dest))
                 : "m" (*((long *) src))
                 : "cc", "memory");
-        __raw_local_irq_ssm(flags);
+        arch_local_irq_restore(flags);
         return rc;
 }