1 files changed, 1 insertions, 1 deletions

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 7e1bfb984064..c4131a817412 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -347,7 +347,7 @@ void (*_machine_power_off)(void) = do_machine_power_off_nonsmp;
 
 void machine_restart(char *command)
 {
-        if (!in_interrupt() || oops_in_progress)
+        if ((!in_interrupt() && !in_atomic()) || oops_in_progress)
                 /*
                  * Only unblank the console if we are called in enabled
                  * context or a bust_spinlocks cleared the way for us.