Pull ec into release branch

[pandora-kernel.git] / arch / um / drivers / line.c

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 0e1e9a2..f75d7b0 100644 (file)
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -370,10 +370,10 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
        struct tty_struct *tty = line->tty;
        int err;
 
-       /* Interrupts are enabled here because we registered the interrupt with
+       /* Interrupts are disabled here because we registered the interrupt with
         * IRQF_DISABLED (see line_setup_irq).*/
 
-       spin_lock_irq(&line->lock);
+       spin_lock(&line->lock);
        err = flush_buffer(line);
        if (err == 0) {
                return IRQ_NONE;
@@ -381,7 +381,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
                line->head = line->buffer;
                line->tail = line->buffer;
        }
-       spin_unlock_irq(&line->lock);
+       spin_unlock(&line->lock);
 
        if(tty == NULL)
                return IRQ_NONE;
@@ -774,7 +774,7 @@ static irqreturn_t winch_interrupt(int irq, void *data)
                line = tty->driver_data;
                chan_window_size(&line->chan_list, &tty->winsize.ws_row,
                                 &tty->winsize.ws_col);
-               kill_pg(tty->pgrp, SIGWINCH, 1);
+               kill_pgrp(tty->pgrp, SIGWINCH, 1);
        }
  out:
        if(winch->fd != -1)