1 files changed, 1 insertions, 1 deletions

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 76515bcea2f1..4c8f5d7f9c23 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -399,7 +399,7 @@ static inline int do_exception(struct pt_regs *regs, int access)
          * user context.
          */
         fault = VM_FAULT_BADCONTEXT;
-        if (unlikely(!user_space_fault(regs) || in_atomic() || !mm))
+        if (unlikely(!user_space_fault(regs) || faulthandler_disabled() || !mm))
                 goto out;
 
         address = trans_exc_code & __FAIL_ADDR_MASK;