diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-04-17 05:46:02 (GMT) |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-04-17 05:46:58 (GMT) |
| commit | d1e23375bf5d1079cd54a1c6bc8592c42061f1e1 (patch) | |
| tree | 771cd2fbf57d68e0a612eb095ae5486901a6ee5f /drivers/s390/char/sclp_tty.c | |
| parent | 8284fb19efa1f11ea8dd213e9e227fc1fcb20586 (diff) | |
| download | linux-d1e23375bf5d1079cd54a1c6bc8592c42061f1e1.tar.xz | |
[S390] sclp: Get rid of in_atomic() use.
Reintroduces in_interrupt() check in sclp_tty code. Add may_schedule
parameter to vt220 write function, so we can let the write function
know if it may schedule or not. So we disallow scheduling for all
console calls and may allow them for tty calls.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/sclp_tty.c')
| -rw-r--r-- | drivers/s390/char/sclp_tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index 2e616e3..e3b3d39 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_atomic()) + if (in_interrupt()) sclp_sync_wait(); else wait_event(sclp_tty_waitq, |