Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into...

[linux-2.6] / drivers / s390 / char / sclp_tty.c

diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 076816b9d52874776ddb576dca5c3b6773a0ebe9..2e616e33891d9816cbda04295eff5b5ec0d963d9 100644 (file)
--- 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,
@@ -648,7 +648,7 @@ sclp_eval_textcmd(struct gds_subvector *start,
        subvec = start;
        while (subvec < end) {
                subvec = find_gds_subvector(subvec, end,
-                                           GDS_KEY_SelfDefTextMsg);
+                                           GDS_KEY_SELFDEFTEXTMSG);
                if (!subvec)
                        break;
                sclp_eval_selfdeftextmsg((struct gds_subvector *)(subvec + 1),
@@ -664,7 +664,7 @@ sclp_eval_cpmsu(struct gds_vector *start, struct gds_vector *end)
 
        vec = start;
        while (vec < end) {
-               vec = find_gds_vector(vec, end, GDS_ID_TextCmd);
+               vec = find_gds_vector(vec, end, GDS_ID_TEXTCMD);
                if (!vec)
                        break;
                sclp_eval_textcmd((struct gds_subvector *)(vec + 1),
@@ -703,7 +703,7 @@ sclp_tty_state_change(struct sclp_register *reg)
 
 static struct sclp_register sclp_input_event =
 {
-       .receive_mask = EvTyp_OpCmd_Mask | EvTyp_PMsgCmd_Mask,
+       .receive_mask = EVTYP_OPCMD_MASK | EVTYP_PMSGCMD_MASK,
        .state_change_fn = sclp_tty_state_change,
        .receiver_fn = sclp_tty_receiver
 };