X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fs390%2Fchar%2Fsclp_tty.c;h=2e616e33891d9816cbda04295eff5b5ec0d963d9;hb=256ae6a720618cbbfacc5e62ea1fe7c129d1b644;hp=e3b3d390b4a3b2294f23428c6e5b70b688298f23;hpb=b928ed56182b8ea59bd43f2d5b865f13a54d5719;p=linux-2.6

diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index e3b3d390b4..2e616e3389 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -332,7 +332,7 @@ sclp_tty_write_string(const unsigned char *str, int count)
 		if (sclp_ttybuf == NULL) {
 			while (list_empty(&sclp_tty_pages)) {
 				spin_unlock_irqrestore(&sclp_tty_lock, flags);
-				if (in_interrupt())
+				if (in_atomic())
 					sclp_sync_wait();
 				else
 					wait_event(sclp_tty_waitq,