1 files changed, 7 insertions, 2 deletions

diff --git a/arch/s390/include/asm/irqflags.h b/arch/s390/include/asm/irqflags.h
index 16aa0c779e07..595a275c36f8 100644
--- a/arch/s390/include/asm/irqflags.h
+++ b/arch/s390/include/asm/irqflags.h
@@ -8,6 +8,8 @@
 
 #include <linux/types.h>
 
+#define ARCH_IRQ_ENABLED        (3UL << (BITS_PER_LONG - 8))
+
 /* store then OR system mask. */
 #define __arch_local_irq_stosm(__or)                                    \
 ({                                                                      \
@@ -54,14 +56,17 @@ static inline notrace void arch_local_irq_enable(void)
         __arch_local_irq_stosm(0x03);
 }
 
+/* This only restores external and I/O interrupt state */
 static inline notrace void arch_local_irq_restore(unsigned long flags)
 {
-        __arch_local_irq_ssm(flags);
+        /* only disabled->disabled and disabled->enabled is valid */
+        if (flags & ARCH_IRQ_ENABLED)
+                arch_local_irq_enable();
 }
 
 static inline notrace bool arch_irqs_disabled_flags(unsigned long flags)
 {
-        return !(flags & (3UL << (BITS_PER_LONG - 8)));
+        return !(flags & ARCH_IRQ_ENABLED);
 }
 
 static inline notrace bool arch_irqs_disabled(void)