X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Fs390%2Fkernel%2Fsetup.c;h=c4131a817412a5c6c4b87a10e3f57a7f8feb5fcd;hb=7aa8dac7ac68f5c2293e2ecf5ef542aa849f541f;hp=7e1bfb98406404c87bd290b2fe4d9a181980ebe0;hpb=3b8c88993e3709b4d44f7ca4e886044a49605394;p=safe%2Fjmp%2Flinux-2.6

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 7e1bfb9..c4131a8 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.