Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

41 files changed, 121 insertions, 123 deletions

diff --git a/drivers/tty/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c
index 16402445f2b..03c285bb2f1 100644
--- a/drivers/tty/bfin_jtag_comm.c
+++ b/drivers/tty/bfin_jtag_comm.c
@@ -251,11 +251,11 @@ static int __init bfin_jc_init(void)
         bfin_jc_write_buf.head = bfin_jc_write_buf.tail = 0;
         bfin_jc_write_buf.buf = kmalloc(CIRC_SIZE, GFP_KERNEL);
         if (!bfin_jc_write_buf.buf)
-                goto err;
+                goto err_buf;
 
         bfin_jc_driver = alloc_tty_driver(1);
         if (!bfin_jc_driver)
-                goto err;
+                goto err_driver;
 
         bfin_jc_driver->owner        = THIS_MODULE;
         bfin_jc_driver->driver_name  = DRV_NAME;
@@ -275,7 +275,9 @@ static int __init bfin_jc_init(void)
 
  err:
         put_tty_driver(bfin_jc_driver);
+ err_driver:
         kfree(bfin_jc_write_buf.buf);
+ err_buf:
         kthread_stop(bfin_jc_kthread);
         return ret;
 }
diff --git a/drivers/tty/hvc/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
index c3425bb3a1f..b6f7d52f7c3 100644
--- a/drivers/tty/hvc/hvc_iucv.c
+++ b/drivers/tty/hvc/hvc_iucv.c
@@ -255,7 +255,7 @@ static int hvc_iucv_write(struct hvc_iucv_private *priv,
                 default:
                         written = -EIO;
                 }
-                /* remove buffer if an error has occured or received data
+                /* remove buffer if an error has occurred or received data
                  * is not correct */
                 if (rc || (rb->mbuf->version != MSG_VERSION) ||
                           (rb->msg.length    != MSG_SIZE(rb->mbuf->datalen)))
@@ -620,7 +620,7 @@ static void hvc_iucv_hangup(struct hvc_iucv_private *priv)
  *              the index of an struct hvc_iucv_private instance.
  *
  * This routine notifies the HVC back-end that a tty hangup (carrier loss,
- * virtual or otherwise) has occured.
+ * virtual or otherwise) has occurred.
  * The z/VM IUCV HVC device driver ignores virtual hangups (vhangup())
  * to keep an existing IUCV communication path established.
  * (Background: vhangup() is called from user space (by getty or login) to
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 5e2f52b3332..e6eea148524 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -1,7 +1,7 @@
 /*
  * vio driver interface to hvc_console.c
  *
- * This code was moved here to allow the remaing code to be reused as a
+ * This code was moved here to allow the remaining code to be reused as a
  * generic polling mode with semi-reliable transport driver core to the
  * console and tty subsystems.
  *
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index c35f1a73bc8..52fdf60bdbe 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -178,7 +178,7 @@ static int __init xen_hvc_init(void)
         if (xencons_irq < 0)
                 xencons_irq = 0; /* NO_IRQ */
         else
-                set_irq_noprobe(xencons_irq);
+                irq_set_noprobe(xencons_irq);
 
         hp = hvc_alloc(HVC_COOKIE, xencons_irq, ops, 256);
         if (IS_ERR(hp))
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index bef238f9ffd..4c8b6654693 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -118,7 +118,7 @@
  * arch/powerepc/include/asm/hvcserver.h
  *
  * 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to
- * prevent possible lockup with realtime scheduling as similarily pointed out by
+ * prevent possible lockup with realtime scheduling as similarly pointed out by
  * akpm in hvc_console.  Changed resulted in the removal of hvcs_final_close()
  * to reorder cleanup operations and prevent discarding of pending data during
  * an hvcs_close().  Removed spinlock protection of hvcs_struct data members in
@@ -581,7 +581,7 @@ static void hvcs_try_write(struct hvcs_struct *hvcsd)
                         /*
                          * We are still obligated to deliver the data to the
                          * hypervisor even if the tty has been closed because
-                         * we commited to delivering it.  But don't try to wake
+                         * we committed to delivering it.  But don't try to wake
                          * a non-existent tty.
                          */
                         if (tty) {
@@ -1349,7 +1349,7 @@ static int hvcs_write(struct tty_struct *tty,
         spin_lock_irqsave(&hvcsd->lock, flags);
 
         /*
-         * Somehow an open succedded but the device was removed or the
+         * Somehow an open succeeded but the device was removed or the
          * connection terminated between the vty-server and partner vty during
          * the middle of a write operation?  This is a crummy place to do this
          * but we want to keep it all in the spinlock.
@@ -1420,7 +1420,7 @@ static int hvcs_write(struct tty_struct *tty,
 }
 
 /*
- * This is really asking how much can we guarentee that we can send or that we
+ * This is really asking how much can we guarantee that we can send or that we
  * absolutely WILL BUFFER if we can't send it.  This driver MUST honor the
  * return value, hence the reason for hvcs_struct buffering.
  */
diff --git a/drivers/tty/mxser.h b/drivers/tty/mxser.h
index 41878a69203..0bf794313ff 100644
--- a/drivers/tty/mxser.h
+++ b/drivers/tty/mxser.h
@@ -113,7 +113,7 @@
 #define MOXA_MUST_IIR_RTO               0x0C
 #define MOXA_MUST_IIR_LSR               0x06
 
-/* recieved Xon/Xoff or specical interrupt pending */
+/* received Xon/Xoff or specical interrupt pending */
 #define MOXA_MUST_IIR_XSC               0x10
 
 /* RTS/CTS change state interrupt pending */
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 176f63256b3..74273e638c0 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -74,7 +74,7 @@ module_param(debug, int, 0600);
 #endif
 
 /*
- * Semi-arbitary buffer size limits. 0710 is normally run with 32-64 byte
+ * Semi-arbitrary buffer size limits. 0710 is normally run with 32-64 byte
  * limits so this is plenty
  */
 #define MAX_MRU 512
@@ -82,7 +82,7 @@ module_param(debug, int, 0600);
 
 /*
  *      Each block of data we have queued to go out is in the form of
- *      a gsm_msg which holds everything we need in a link layer independant
+ *      a gsm_msg which holds everything we need in a link layer independent
  *      format
  */
 
@@ -1193,8 +1193,8 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command,
                 break;
                 /* Optional unsupported commands */
         case CMD_PN:    /* Parameter negotiation */
-        case CMD_RPN:   /* Remote port negotation */
-        case CMD_SNC:   /* Service negotation command */
+        case CMD_RPN:   /* Remote port negotiation */
+        case CMD_SNC:   /* Service negotiation command */
         default:
                 /* Reply to bad commands with an NSC */
                 buf[0] = command;
@@ -1658,8 +1658,12 @@ static void gsm_queue(struct gsm_mux *gsm)
 
         if ((gsm->control & ~PF) == UI)
                 gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf, gsm->len);
-        /* generate final CRC with received FCS */
-        gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
+        if (gsm->encoding == 0){
+                /* WARNING: gsm->received_fcs is used for gsm->encoding = 0 only.
+                            In this case it contain the last piece of data
+                            required to generate final CRC */
+                gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
+        }
         if (gsm->fcs != GOOD_FCS) {
                 gsm->bad_fcs++;
                 if (debug & 4)
@@ -2026,7 +2030,7 @@ EXPORT_SYMBOL_GPL(gsm_activate_mux);
  *      @mux: mux to free
  *
  *      Dispose of allocated resources for a dead mux. No refcounting
- *      at present so the mux must be truely dead.
+ *      at present so the mux must be truly dead.
  */
 void gsm_free_mux(struct gsm_mux *gsm)
 {
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 428f4fe0b5f..0ad32888091 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -95,6 +95,7 @@ static void n_tty_set_room(struct tty_struct *tty)
 {
         /* tty->read_cnt is not read locked ? */
         int     left = N_TTY_BUF_SIZE - tty->read_cnt - 1;
+        int old_left;
 
         /*
          * If we are doing input canonicalization, and there are no
@@ -104,7 +105,12 @@ static void n_tty_set_room(struct tty_struct *tty)
          */
         if (left <= 0)
                 left = tty->icanon && !tty->canon_data;
+        old_left = tty->receive_room;
         tty->receive_room = left;
+
+        /* Did this open up the receive buffer? We may need to flip */
+        if (left && !old_left)
+                schedule_work(&tty->buf.work);
 }
 
 static void put_tty_queue_nolock(unsigned char c, struct tty_struct *tty)
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index f4f11164efe..fd0a98524d5 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1673,7 +1673,7 @@ static void ntty_hangup(struct tty_struct *tty)
 
 /*
  * called when the userspace process writes to the tty (/dev/noz*).
- * Data is inserted into a fifo, which is then read and transfered to the modem.
+ * Data is inserted into a fifo, which is then read and transferred to the modem.
  */
 static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
                       int count)
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 3780da8ad12..036feeb5e3f 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -2060,7 +2060,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
                         sClockPrescale = 0x19;
                         rp_baud_base[i] = 230400;
                 } else {
-                        /* mod 4 (devide by 5) prescale */
+                        /* mod 4 (divide by 5) prescale */
                         sClockPrescale = 0x14;
                         rp_baud_base[i] = 460800;
                 }
@@ -2183,7 +2183,7 @@ static int __init init_ISA(int i)
                 sClockPrescale = 0x19;  /* mod 9 (divide by 10) prescale */
                 rp_baud_base[i] = 230400;
         } else {
-                sClockPrescale = 0x14;  /* mod 4 (devide by 5) prescale */
+                sClockPrescale = 0x14;  /* mod 4 (divide by 5) prescale */
                 rp_baud_base[i] = 460800;
         }
 
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index b3b881bc471..6611535f444 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -1629,7 +1629,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
                             up->port.iotype == UPIO_DWAPB32) &&
                           (iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
                         /* The DesignWare APB UART has an Busy Detect (0x07)
-                         * interrupt meaning an LCR write attempt occured while the
+                         * interrupt meaning an LCR write attempt occurred while the
                          * UART was busy. The interrupt must be cleared by reading
                          * the UART status register (USR) and the LCR re-written. */
                         unsigned int status;
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 8b8930f700b..738cec9807d 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -433,7 +433,7 @@ static void __devexit sbs_exit(struct pci_dev *dev)
 /*
  * SIIG serial cards have an PCI interface chip which also controls
  * the UART clocking frequency. Each UART can be clocked independently
- * (except cards equiped with 4 UARTs) and initial clocking settings
+ * (except cards equipped with 4 UARTs) and initial clocking settings
  * are stored in the EEPROM chip. It can cause problems because this
  * version of serial driver doesn't support differently clocked UART's
  * on single PCI card. To prevent this, initialization functions set
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index e1aee37270f..80484af781e 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1506,7 +1506,7 @@ config SERIAL_BCM63XX_CONSOLE
 
 config SERIAL_GRLIB_GAISLER_APBUART
         tristate "GRLIB APBUART serial support"
-        depends on OF
+        depends on OF && SPARC
         select SERIAL_CORE
         ---help---
         Add support for the GRLIB APBUART serial port.
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 57731e87008..6deee4e546b 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -520,7 +520,7 @@ static bool pl011_dma_tx_irq(struct uart_amba_port *uap)
 
         /*
          * We don't have a TX buffer queued, so try to queue one.
-         * If we succesfully queued a buffer, mask the TX IRQ.
+         * If we successfully queued a buffer, mask the TX IRQ.
          */
         if (pl011_dma_tx_refill(uap) > 0) {
                 uap->im &= ~UART011_TXIM;
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index 1ab999b04ef..19a943693e4 100644
--- a/drivers/tty/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c
@@ -555,10 +555,9 @@ static struct uart_driver grlib_apbuart_driver = {
 
 static int __devinit apbuart_probe(struct platform_device *op)
 {
-        int i = -1;
+        int i;
         struct uart_port *port = NULL;
 
-        i = 0;
         for (i = 0; i < grlib_apbuart_port_nr; i++) {
                 if (op->dev.of_node == grlib_apbuart_nodes[i])
                         break;
@@ -566,6 +565,7 @@ static int __devinit apbuart_probe(struct platform_device *op)
 
         port = &grlib_apbuart_ports[i];
         port->dev = &op->dev;
+        port->irq = op->archdata.irqs[0];
 
         uart_add_one_port(&grlib_apbuart_driver, (struct uart_port *) port);
 
@@ -598,24 +598,12 @@ static struct platform_driver grlib_apbuart_of_driver = {
 
 static int grlib_apbuart_configure(void)
 {
-        struct device_node *np, *rp;
-        const u32 *prop;
-        int freq_khz, line = 0;
-
-        /* Get bus frequency */
-        rp = of_find_node_by_path("/");
-        if (!rp)
-                return -ENODEV;
-        rp = of_get_next_child(rp, NULL);
-        if (!rp)
-                return -ENODEV;
-        prop = of_get_property(rp, "clock-frequency", NULL);
-        if (!prop)
-                return -ENODEV;
-        freq_khz = *prop;
+        struct device_node *np;
+        int line = 0;
 
         for_each_matching_node(np, apbuart_match) {
-                const int *irqs, *ampopts;
+                const int *ampopts;
+                const u32 *freq_hz;
                 const struct amba_prom_registers *regs;
                 struct uart_port *port;
                 unsigned long addr;
@@ -623,11 +611,11 @@ static int grlib_apbuart_configure(void)
                 ampopts = of_get_property(np, "ampopts", NULL);
                 if (ampopts && (*ampopts == 0))
                         continue; /* Ignore if used by another OS instance */
-
-                irqs = of_get_property(np, "interrupts", NULL);
                 regs = of_get_property(np, "reg", NULL);
+                /* Frequency of APB Bus is frequency of UART */
+                freq_hz = of_get_property(np, "freq", NULL);
 
-                if (!irqs || !regs)
+                if (!regs || !freq_hz || (*freq_hz == 0))
                         continue;
 
                 grlib_apbuart_nodes[line] = np;
@@ -638,12 +626,12 @@ static int grlib_apbuart_configure(void)
 
                 port->mapbase = addr;
                 port->membase = ioremap(addr, sizeof(struct grlib_apbuart_regs_map));
-                port->irq = *irqs;
+                port->irq = 0;
                 port->iotype = UPIO_MEM;
                 port->ops = &grlib_apbuart_ops;
                 port->flags = UPF_BOOT_AUTOCONF;
                 port->line = line;
-                port->uartclk = freq_khz * 1000;
+                port->uartclk = *freq_hz;
                 port->fifosize = apbuart_scan_fifo_size((struct uart_port *) port, line);
                 line++;
 
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 53a46822705..8a869e58f6d 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1248,7 +1248,7 @@ static void icom_set_termios(struct uart_port *port,
                 }
         }
 
-        /* Enable Transmitter and Reciever */
+        /* Enable Transmitter and Receiver */
         offset =
             (unsigned long) &ICOM_PORT->statStg->rcv[0] -
             (unsigned long) ICOM_PORT->statStg;
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index dfcf4b1878a..62df72d9f0a 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -78,7 +78,7 @@
 #define  URXD_FRMERR     (1<<12)
 #define  URXD_BRK        (1<<11)
 #define  URXD_PRERR      (1<<10)
-#define  UCR1_ADEN       (1<<15) /* Auto dectect interrupt */
+#define  UCR1_ADEN       (1<<15) /* Auto detect interrupt */
 #define  UCR1_ADBR       (1<<14) /* Auto detect baud rate */
 #define  UCR1_TRDYEN     (1<<13) /* Transmitter ready interrupt enable */
 #define  UCR1_IDEN       (1<<12) /* Idle condition interrupt */
@@ -382,12 +382,13 @@ static void imx_start_tx(struct uart_port *port)
 static irqreturn_t imx_rtsint(int irq, void *dev_id)
 {
         struct imx_port *sport = dev_id;
-        unsigned int val = readl(sport->port.membase + USR1) & USR1_RTSS;
+        unsigned int val;
         unsigned long flags;
 
         spin_lock_irqsave(&sport->port.lock, flags);
 
         writel(USR1_RTSD, sport->port.membase + USR1);
+        val = readl(sport->port.membase + USR1) & USR1_RTSS;
         uart_handle_cts_change(&sport->port, !!val);
         wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
 
diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
index ebff4a1d4bc..7b1cda59ebb 100644
--- a/drivers/tty/serial/ip22zilog.c
+++ b/drivers/tty/serial/ip22zilog.c
@@ -375,7 +375,7 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up,
                  * be nice to transmit console writes just like we normally would for
                  * a TTY line. (ie. buffered and TX interrupt driven).  That is not
                  * easy because console writes cannot sleep.  One solution might be
-                 * to poll on enough port->xmit space becomming free.  -DaveM
+                 * to poll on enough port->xmit space becoming free.  -DaveM
                  */
                 if (!(status & Tx_BUF_EMP))
                         return;
diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h
index 38a509c684c..b704c8ce0d7 100644
--- a/drivers/tty/serial/jsm/jsm.h
+++ b/drivers/tty/serial/jsm/jsm.h
@@ -273,7 +273,7 @@ struct neo_uart_struct {
          u8 fctr;               /* WR   FCTR - Feature Control Reg */
          u8 efr;                /* WR   EFR - Enhanced Function Reg */
          u8 tfifo;              /* WR   TXCNT/TXTRG - Transmit FIFO Reg */
-         u8 rfifo;              /* WR   RXCNT/RXTRG - Recieve FIFO Reg */
+         u8 rfifo;              /* WR   RXCNT/RXTRG - Receive FIFO Reg */
          u8 xoffchar1;  /* WR   XOFF 1 - XOff Character 1 Reg */
          u8 xoffchar2;  /* WR   XOFF 2 - XOff Character 2 Reg */
          u8 xonchar1;   /* WR   XON 1 - Xon Character 1 Reg */
diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
index 7960d9633c1..4538c3e3646 100644
--- a/drivers/tty/serial/jsm/jsm_neo.c
+++ b/drivers/tty/serial/jsm/jsm_neo.c
@@ -381,7 +381,7 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
                 /* Copy data from uart to the queue */
                 memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, n);
                 /*
-                 * Since RX_FIFO_DATA_ERROR was 0, we are guarenteed
+                 * Since RX_FIFO_DATA_ERROR was 0, we are guaranteed
                  * that all the data currently in the FIFO is free of
                  * breaks and parity/frame/orun errors.
                  */
@@ -1210,7 +1210,7 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
                          * Why would I check EVERY possibility of type of
                          * interrupt, when we know its TXRDY???
                          * Becuz for some reason, even tho we got triggered for TXRDY,
-                         * it seems to be occassionally wrong. Instead of TX, which
+                         * it seems to be occasionally wrong. Instead of TX, which
                          * it should be, I was getting things like RXDY too. Weird.
                          */
                         neo_parse_isr(brd, port);
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 25a8bc565f4..87e7e6c876d 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -131,7 +131,7 @@ static void kgdboc_unregister_kbd(void)
 
 static int kgdboc_option_setup(char *opt)
 {
-        if (strlen(opt) > MAX_CONFIG_LEN) {
+        if (strlen(opt) >= MAX_CONFIG_LEN) {
                 printk(KERN_ERR "kgdboc: config string too long\n");
                 return -ENOSPC;
         }
diff --git a/drivers/tty/serial/max3107.h b/drivers/tty/serial/max3107.h
index 7ab63239250..8415fc723b9 100644
--- a/drivers/tty/serial/max3107.h
+++ b/drivers/tty/serial/max3107.h
@@ -369,7 +369,7 @@ struct max3107_port {
         struct spi_device *spi;
 
 #if defined(CONFIG_GPIOLIB)
-        /* GPIO chip stucture */
+        /* GPIO chip structure */
         struct gpio_chip chip;
 #endif
 
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index 8890612a8d9..1bd28450ca4 100644
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -23,7 +23,7 @@
  *    1 word. If SPI master controller doesn't support sclk frequency change,
  *    then the char need be sent out one by one with some delay
  *
- * 2. Currently only RX availabe interrrupt is used, no need for waiting TXE
+ * 2. Currently only RX available interrrupt is used, no need for waiting TXE
  *    interrupt for a low speed UART device
  */
 
diff --git a/drivers/tty/serial/mrst_max3110.h b/drivers/tty/serial/mrst_max3110.h
index d1ef43af397..c37ea48c825 100644
--- a/drivers/tty/serial/mrst_max3110.h
+++ b/drivers/tty/serial/mrst_max3110.h
@@ -21,7 +21,7 @@
 
 #define WC_IRQ_MASK             (0xF << 8)
 #define WC_TXE_IRQ_ENABLE       (1 << 11)       /* TX empty irq */
-#define WC_RXA_IRQ_ENABLE       (1 << 10)       /* RX availabe irq */
+#define WC_RXA_IRQ_ENABLE       (1 << 10)       /* RX available irq */
 #define WC_PAR_HIGH_IRQ_ENABLE  (1 << 9)
 #define WC_REC_ACT_IRQ_ENABLE   (1 << 8)
 
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 2e7fc9cee9c..624701f8138 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -495,7 +495,7 @@ static void msm_hs_pm(struct uart_port *uport, unsigned int state,
  *
  * Interrupts should be disabled before we are called, as
  * we modify Set Baud rate
- * Set receive stale interrupt level, dependant on Bit Rate
+ * Set receive stale interrupt level, dependent on Bit Rate
  * Goal is to have around 8 ms before indicate stale.
  * roundup (((Bit Rate * .008) / 10) + 1
  */
@@ -1350,7 +1350,7 @@ static irqreturn_t msm_hs_rx_wakeup_isr(int irq, void *dev)
 
         spin_lock_irqsave(&uport->lock, flags);
         if (msm_uport->clk_state == MSM_HS_CLK_OFF) {
-                /* ignore the first irq - it is a pending irq that occured
+                /* ignore the first irq - it is a pending irq that occurred
                  * before enable_irq() */
                 if (msm_uport->rx_wakeup.ignore)
                         msm_uport->rx_wakeup.ignore = 0;
@@ -1644,7 +1644,7 @@ static int __devinit msm_hs_probe(struct platform_device *pdev)
         if (unlikely(uport->irq < 0))
                 return -ENXIO;
 
-        if (unlikely(set_irq_wake(uport->irq, 1)))
+        if (unlikely(irq_set_irq_wake(uport->irq, 1)))
                 return -ENXIO;
 
         if (pdata == NULL || pdata->rx_wakeup_irq < 0)
@@ -1658,7 +1658,7 @@ static int __devinit msm_hs_probe(struct platform_device *pdev)
                 if (unlikely(msm_uport->rx_wakeup.irq < 0))
                         return -ENXIO;
 
-                if (unlikely(set_irq_wake(msm_uport->rx_wakeup.irq, 1)))
+                if (unlikely(irq_set_irq_wake(msm_uport->rx_wakeup.irq, 1)))
                         return -ENXIO;
         }
 
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 763537943a5..47cadf47414 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -13,7 +13,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Note: This driver is made seperate from 8250 driver as we cannot
+ * Note: This driver is made separate from 8250 driver as we cannot
  * over load 8250 driver with omap platform specific configuration for
  * features like DMA, it makes easier to implement features like DMA and
  * hardware flow control and software flow control configuration with
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 5b9cde79e4e..e1c8d4f1ce5 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -330,7 +330,7 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
                  * When that happens, I disable the receive side of the driver.
                  * Note that what I've been experiencing is a real irq loop where
                  * I'm getting flooded regardless of the actual port speed.
-                 * Something stange is going on with the HW
+                 * Something strange is going on with the HW
                  */
                 if ((++loops) > 1000)
                         goto flood;
@@ -396,7 +396,7 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap)
                  * be nice to transmit console writes just like we normally would for
                  * a TTY line. (ie. buffered and TX interrupt driven).  That is not
                  * easy because console writes cannot sleep.  One solution might be
-                 * to poll on enough port->xmit space becomming free.  -DaveM
+                 * to poll on enough port->xmit space becoming free.  -DaveM
                  */
                 if (!(status & Tx_BUF_EMP))
                         return;
@@ -809,7 +809,7 @@ static int pmz_set_scc_power(struct uart_pmac_port *uap, int state)
 #endif /* !CONFIG_PPC_PMAC */
 
 /*
- * FixZeroBug....Works around a bug in the SCC receving channel.
+ * FixZeroBug....Works around a bug in the SCC receiving channel.
  * Inspired from Darwin code, 15 Sept. 2000  -DanM
  *
  * The following sequence prevents a problem that is seen with O'Hare ASICs
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 2335edafe90..9e2fa8d784e 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -64,7 +64,7 @@
 #define tx_enabled(port) ((port)->unused[0])
 #define rx_enabled(port) ((port)->unused[1])
 
-/* flag to ignore all characters comming in */
+/* flag to ignore all characters coming in */
 #define RXSTAT_DUMMY_READ (0x10000000)
 
 static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port)
@@ -291,7 +291,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
                 goto out;
         }
 
-        /* if there isnt anything more to transmit, or the uart is now
+        /* if there isn't anything more to transmit, or the uart is now
          * stopped, disable the uart and exit
         */
 
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index eb7958c675a..920a6f929c8 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -812,7 +812,7 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 }
 
 /*
- * Here we define a transistion notifier so that we can update all of our
+ * Here we define a transition notifier so that we can update all of our
  * ports' baud rate when the peripheral clock changes.
  */
 static int sci_notifier(struct notifier_block *self,
@@ -1836,6 +1836,12 @@ static int __devinit serial_console_setup(struct console *co, char *options)
         sci_port = &sci_ports[co->index];
         port = &sci_port->port;
 
+        /*
+         * Refuse to handle uninitialized ports.
+         */
+        if (!port->ops)
+                return -ENODEV;
+
         ret = sci_remap_port(port);
         if (unlikely(ret != 0))
                 return ret;
@@ -1866,13 +1872,6 @@ static struct console serial_console = {
         .data           = &sci_uart_driver,
 };
 
-static int __init sci_console_init(void)
-{
-        register_console(&serial_console);
-        return 0;
-}
-console_initcall(sci_console_init);
-
 static struct console early_serial_console = {
         .name           = "early_ttySC",
         .write          = serial_console_write,
@@ -1901,18 +1900,18 @@ static int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
         register_console(&early_serial_console);
         return 0;
 }
+
+#define SCI_CONSOLE     (&serial_console)
+
 #else
 static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
 {
         return -EINVAL;
 }
-#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
 
-#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE)
-#define SCI_CONSOLE     (&serial_console)
-#else
-#define SCI_CONSOLE     0
-#endif
+#define SCI_CONSOLE     NULL
+
+#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
 
 static char banner[] __initdata =
         KERN_INFO "SuperH SCI(F) driver initialized\n";
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index cff9a306660..377ae74e715 100644
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -146,7 +146,7 @@ static struct sn_sal_ops intr_ops = {
 };
 
 /* the console does output in two distinctly different ways:
- * synchronous (raw) and asynchronous (buffered).  initally, early_printk
+ * synchronous (raw) and asynchronous (buffered).  initially, early_printk
  * does synchronous output.  any data written goes directly to the SAL
  * to be output (incidentally, it is internally buffered by the SAL)
  * after interrupts and timers are initialized and available for use,
@@ -481,7 +481,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
         while (port->sc_ops->sal_input_pending()) {
                 ch = port->sc_ops->sal_getc();
                 if (ch < 0) {
-                        printk(KERN_ERR "sn_console: An error occured while "
+                        printk(KERN_ERR "sn_console: An error occurred while "
                                "obtaining data from the console (0x%0x)\n", ch);
                         break;
                 }
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 99ff9abf57c..8e916e76b7b 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -474,7 +474,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
                  * be nice to transmit console writes just like we normally would for
                  * a TTY line. (ie. buffered and TX interrupt driven).  That is not
                  * easy because console writes cannot sleep.  One solution might be
-                 * to poll on enough port->xmit space becomming free.  -DaveM
+                 * to poll on enough port->xmit space becoming free.  -DaveM
                  */
                 if (!(status & Tx_BUF_EMP))
                         return;
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 18888d005a0..27da23d98e3 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -4072,7 +4072,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
         
         if ( request_irq(info->irq_level,mgsl_interrupt,info->irq_flags,
                 info->device_name, info ) < 0 ) {
-                printk( "%s(%d):Cant request interrupt on device %s IRQ=%d\n",
+                printk( "%s(%d):Can't request interrupt on device %s IRQ=%d\n",
                         __FILE__,__LINE__,info->device_name, info->irq_level );
                 goto errout;
         }
@@ -4095,7 +4095,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                 info->memory_base = ioremap_nocache(info->phys_memory_base,
                                                                 0x40000);
                 if (!info->memory_base) {
-                        printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n",
+                        printk( "%s(%d):Can't map shared memory on device %s MemAddr=%08X\n",
                                 __FILE__,__LINE__,info->device_name, info->phys_memory_base );
                         goto errout;
                 }
@@ -4109,7 +4109,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                 info->lcr_base = ioremap_nocache(info->phys_lcr_base,
                                                                 PAGE_SIZE);
                 if (!info->lcr_base) {
-                        printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n",
+                        printk( "%s(%d):Can't map LCR memory on device %s MemAddr=%08X\n",
                                 __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
                         goto errout;
                 }
@@ -4119,7 +4119,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                 /* claim DMA channel */
                 
                 if (request_dma(info->dma_level,info->device_name) < 0){
-                        printk( "%s(%d):Cant request DMA channel on device %s DMA=%d\n",
+                        printk( "%s(%d):Can't request DMA channel on device %s DMA=%d\n",
                                 __FILE__,__LINE__,info->device_name, info->dma_level );
                         mgsl_release_resources( info );
                         return -ENODEV;
@@ -4132,7 +4132,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
         }
         
         if ( mgsl_allocate_dma_buffers(info) < 0 ) {
-                printk( "%s(%d):Cant allocate DMA buffers on device %s DMA=%d\n",
+                printk( "%s(%d):Can't allocate DMA buffers on device %s DMA=%d\n",
                         __FILE__,__LINE__,info->device_name, info->dma_level );
                 goto errout;
         }       
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index a35dd549a00..18b48cd3b41 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3491,7 +3491,7 @@ static int claim_resources(struct slgt_info *info)
 
         info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE);
         if (!info->reg_addr) {
-                DBGERR(("%s cant map device registers, addr=%08X\n",
+                DBGERR(("%s can't map device registers, addr=%08X\n",
                         info->device_name, info->phys_reg_addr));
                 info->init_error = DiagStatus_CantAssignPciResources;
                 goto errout;
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 32734369447..c77831c7675 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -3595,7 +3595,7 @@ static int claim_resources(SLMP_INFO *info)
         info->memory_base = ioremap_nocache(info->phys_memory_base,
                                                                 SCA_MEM_SIZE);
         if (!info->memory_base) {
-                printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n",
+                printk( "%s(%d):%s Can't map shared memory, MemAddr=%08X\n",
                         __FILE__,__LINE__,info->device_name, info->phys_memory_base );
                 info->init_error = DiagStatus_CantAssignPciResources;
                 goto errout;
@@ -3603,7 +3603,7 @@ static int claim_resources(SLMP_INFO *info)
 
         info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE);
         if (!info->lcr_base) {
-                printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n",
+                printk( "%s(%d):%s Can't map LCR memory, MemAddr=%08X\n",
                         __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
                 info->init_error = DiagStatus_CantAssignPciResources;
                 goto errout;
@@ -3612,7 +3612,7 @@ static int claim_resources(SLMP_INFO *info)
 
         info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE);
         if (!info->sca_base) {
-                printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n",
+                printk( "%s(%d):%s Can't map SCA memory, MemAddr=%08X\n",
                         __FILE__,__LINE__,info->device_name, info->phys_sca_base );
                 info->init_error = DiagStatus_CantAssignPciResources;
                 goto errout;
@@ -3622,7 +3622,7 @@ static int claim_resources(SLMP_INFO *info)
         info->statctrl_base = ioremap_nocache(info->phys_statctrl_base,
                                                                 PAGE_SIZE);
         if (!info->statctrl_base) {
-                printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n",
+                printk( "%s(%d):%s Can't map SCA Status/Control memory, MemAddr=%08X\n",
                         __FILE__,__LINE__,info->device_name, info->phys_statctrl_base );
                 info->init_error = DiagStatus_CantAssignPciResources;
                 goto errout;
@@ -3869,7 +3869,7 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
                                         port_array[0]->irq_flags,
                                         port_array[0]->device_name,
                                         port_array[0]) < 0 ) {
-                        printk( "%s(%d):%s Cant request interrupt, IRQ=%d\n",
+                        printk( "%s(%d):%s Can't request interrupt, IRQ=%d\n",
                                 __FILE__,__LINE__,
                                 port_array[0]->device_name,
                                 port_array[0]->irq_level );
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 81f13958e75..43db715f150 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -306,7 +306,7 @@ static struct sysrq_key_op sysrq_ftrace_dump_op = {
 
 static void sysrq_handle_showmem(int key)
 {
-        show_mem();
+        show_mem(0);
 }
 static struct sysrq_key_op sysrq_showmem_op = {
         .handler        = sysrq_handle_showmem,
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index d8210ca0072..f1a7918d71a 100644
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -322,7 +322,7 @@ void tty_schedule_flip(struct tty_struct *tty)
         if (tty->buf.tail != NULL)
                 tty->buf.tail->commit = tty->buf.tail->used;
         spin_unlock_irqrestore(&tty->buf.lock, flags);
-        schedule_delayed_work(&tty->buf.work, 1);
+        schedule_work(&tty->buf.work);
 }
 EXPORT_SYMBOL(tty_schedule_flip);
 
@@ -402,7 +402,7 @@ EXPORT_SYMBOL_GPL(tty_prepare_flip_string_flags);
 static void flush_to_ldisc(struct work_struct *work)
 {
         struct tty_struct *tty =
-                container_of(work, struct tty_struct, buf.work.work);
+                container_of(work, struct tty_struct, buf.work);
         unsigned long   flags;
         struct tty_ldisc *disc;
 
@@ -442,10 +442,8 @@ static void flush_to_ldisc(struct work_struct *work)
                            line discipline as we want to empty the queue */
                         if (test_bit(TTY_FLUSHPENDING, &tty->flags))
                                 break;
-                        if (!tty->receive_room || seen_tail) {
-                                schedule_delayed_work(&tty->buf.work, 1);
+                        if (!tty->receive_room || seen_tail)
                                 break;
-                        }
                         if (count > tty->receive_room)
                                 count = tty->receive_room;
                         char_buf = head->char_buf_ptr + head->read;
@@ -481,7 +479,7 @@ static void flush_to_ldisc(struct work_struct *work)
  */
 void tty_flush_to_ldisc(struct tty_struct *tty)
 {
-        flush_delayed_work(&tty->buf.work);
+        flush_work(&tty->buf.work);
 }
 
 /**
@@ -506,9 +504,9 @@ void tty_flip_buffer_push(struct tty_struct *tty)
         spin_unlock_irqrestore(&tty->buf.lock, flags);
 
         if (tty->low_latency)
-                flush_to_ldisc(&tty->buf.work.work);
+                flush_to_ldisc(&tty->buf.work);
         else
-                schedule_delayed_work(&tty->buf.work, 1);
+                schedule_work(&tty->buf.work);
 }
 EXPORT_SYMBOL(tty_flip_buffer_push);
 
@@ -529,6 +527,6 @@ void tty_buffer_init(struct tty_struct *tty)
         tty->buf.tail = NULL;
         tty->buf.free = NULL;
         tty->buf.memory_used = 0;
-        INIT_DELAYED_WORK(&tty->buf.work, flush_to_ldisc);
+        INIT_WORK(&tty->buf.work, flush_to_ldisc);
 }
 
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 936a4ead6c2..d7d50b48287 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2134,7 +2134,7 @@ done:
  *      actually has driver level meaning and triggers a VC resize.
  *
  *      Locking:
- *              Driver dependant. The default do_resize method takes the
+ *              Driver dependent. The default do_resize method takes the
  *      tty termios mutex and ctrl_lock. The console takes its own lock
  *      then calls into the default method.
  */
@@ -2155,7 +2155,7 @@ static int tiocswinsz(struct tty_struct *tty, struct winsize __user *arg)
  *      tioccons        -       allow admin to move logical console
  *      @file: the file to become console
  *
- *      Allow the adminstrator to move the redirected console device
+ *      Allow the administrator to move the redirected console device
  *
  *      Locking: uses redirect_lock to guard the redirect information
  */
@@ -2290,7 +2290,7 @@ EXPORT_SYMBOL_GPL(tty_get_pgrp);
 /**
  *      tiocgpgrp               -       get process group
  *      @tty: tty passed by user
- *      @real_tty: tty side of the tty pased by the user if a pty else the tty
+ *      @real_tty: tty side of the tty passed by the user if a pty else the tty
  *      @p: returned pid
  *
  *      Obtain the process group of the tty. If there is no process group
@@ -2367,7 +2367,7 @@ out_unlock:
 /**
  *      tiocgsid                -       get session id
  *      @tty: tty passed by user
- *      @real_tty: tty side of the tty pased by the user if a pty else the tty
+ *      @real_tty: tty side of the tty passed by the user if a pty else the tty
  *      @p: pointer to returned session id
  *
  *      Obtain the session id of the tty. If there is no session
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index d73c593795a..620c971422b 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -247,7 +247,7 @@ speed_t tty_termios_baud_rate(struct ktermios *termios)
         cbaud = termios->c_cflag & CBAUD;
 
 #ifdef BOTHER
-        /* Magic token for arbitary speed via c_ispeed/c_ospeed */
+        /* Magic token for arbitrary speed via c_ispeed/c_ospeed */
         if (cbaud == BOTHER)
                 return termios->c_ospeed;
 #endif
@@ -283,7 +283,7 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios)
         if (cbaud == B0)
                 return tty_termios_baud_rate(termios);
 
-        /* Magic token for arbitary speed via c_ispeed*/
+        /* Magic token for arbitrary speed via c_ispeed*/
         if (cbaud == BOTHER)
                 return termios->c_ispeed;
 
@@ -449,7 +449,7 @@ EXPORT_SYMBOL(tty_get_baud_rate);
  *      @new: New termios
  *      @old: Old termios
  *
- *      Propogate the hardware specific terminal setting bits from
+ *      Propagate the hardware specific terminal setting bits from
  *      the old termios structure to the new one. This is used in cases
  *      where the hardware does not support reconfiguration or as a helper
  *      in some cases where only minimal reconfiguration is supported
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 0fc564a9770..e19e1364711 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -529,7 +529,7 @@ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
 static int tty_ldisc_halt(struct tty_struct *tty)
 {
         clear_bit(TTY_LDISC, &tty->flags);
-        return cancel_delayed_work_sync(&tty->buf.work);
+        return cancel_work_sync(&tty->buf.work);
 }
 
 /**
@@ -542,7 +542,7 @@ static void tty_ldisc_flush_works(struct tty_struct *tty)
 {
         flush_work_sync(&tty->hangup_work);
         flush_work_sync(&tty->SAK_work);
-        flush_delayed_work_sync(&tty->buf.work);
+        flush_work_sync(&tty->buf.work);
 }
 
 /**
@@ -722,9 +722,9 @@ enable:
         /* Restart the work queue in case no characters kick it off. Safe if
            already running */
         if (work)
-                schedule_delayed_work(&tty->buf.work, 1);
+                schedule_work(&tty->buf.work);
         if (o_work)
-                schedule_delayed_work(&o_tty->buf.work, 1);
+                schedule_work(&o_tty->buf.work);
         mutex_unlock(&tty->ldisc_mutex);
         tty_unlock();
         return retval;
@@ -830,12 +830,12 @@ void tty_ldisc_hangup(struct tty_struct *tty)
 
         /*
          * this is like tty_ldisc_halt, but we need to give up
-         * the BTM before calling cancel_delayed_work_sync,
-         * which may need to wait for another function taking the BTM
+         * the BTM before calling cancel_work_sync, which may
+         * need to wait for another function taking the BTM
          */
         clear_bit(TTY_LDISC, &tty->flags);
         tty_unlock();
-        cancel_delayed_work_sync(&tty->buf.work);
+        cancel_work_sync(&tty->buf.work);
         mutex_unlock(&tty->ldisc_mutex);
 
         tty_lock();
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 6dd3c68c13a..d6b342b5b42 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -600,7 +600,7 @@ static void fn_scroll_back(struct vc_data *vc)
 
 static void fn_show_mem(struct vc_data *vc)
 {
-        show_mem();
+        show_mem(0);
 }
 
 static void fn_show_state(struct vc_data *vc)
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index c83cdfb56fc..4bea1efaec9 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3963,7 +3963,7 @@ void reset_palette(struct vc_data *vc)
  *  of 32 pixels. Userspace fontdata is stored with 32 bytes (shorts/ints, 
  *  depending on width) reserved for each character which is kinda wasty, but 
  *  this is done in order to maintain compatibility with the EGA/VGA fonts. It 
- *  is upto the actual low-level console-driver convert data into its favorite
+ *  is up to the actual low-level console-driver convert data into its favorite
  *  format (maybe we should add a `fontoffset' field to the `display'
  *  structure so we won't have to convert the fontdata all the time.
  *  /Jes