Merge branch 'x86/platform' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into stable/for-linus-3.7

* 'x86/platform' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (9690 commits)
  x86: Document x86_init.paging.pagetable_init()
  x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done()
  x86: Move paging_init() call to x86_init.paging.pagetable_init()
  x86: Rename pagetable_setup_start() to pagetable_init()
  x86: Remove base argument from x86_init.paging.pagetable_setup_start
  Linux 3.6-rc5
  HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured
  Remove user-triggerable BUG from mpol_to_str
  xen/pciback: Fix proper FLR steps.
  uml: fix compile error in deliver_alarm()
  dj: memory scribble in logi_dj
  Fix order of arguments to compat_put_time[spec|val]
  xen: Use correct masking in xen_swiotlb_alloc_coherent.
  xen: fix logical error in tlb flushing
  xen/p2m: Fix one-off error in checking the P2M tree directory.
  powerpc: Don't use __put_user() in patch_instruction
  powerpc: Make sure IPI handlers see data written by IPI senders
  powerpc: Restore correct DSCR in context switch
  powerpc: Fix DSCR inheritance in copy_thread()
  powerpc: Keep thread.dscr and thread.dscr_inherit in sync
  ...

16 files changed, 170 insertions, 76 deletions

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index dc07f56d66b5..2944ff88fdc0 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -211,11 +211,10 @@ static int xen_hvm_console_init(void)
                 info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
                 if (!info)
                         return -ENOMEM;
-        }
-
-        /* already configured */
-        if (info->intf != NULL)
+        } else if (info->intf != NULL) {
+                /* already configured */
                 return 0;
+        }
         /*
          * If the toolstack (or the hypervisor) hasn't set these values, the
          * default value is 0. Even though mfn = 0 and evtchn = 0 are
@@ -261,12 +260,10 @@ static int xen_pv_console_init(void)
                 info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
                 if (!info)
                         return -ENOMEM;
-        }
-
-        /* already configured */
-        if (info->intf != NULL)
+        } else if (info->intf != NULL) {
+                /* already configured */
                 return 0;
-
+        }
         info->evtchn = xen_start_info->console.domU.evtchn;
         info->intf = mfn_to_virt(xen_start_info->console.domU.mfn);
         info->vtermno = HVC_COOKIE;
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 6e1958a325bd..8123f784bcda 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -282,6 +282,14 @@ static const struct serial8250_config uart_config[] = {
                 .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                 .flags          = UART_CAP_FIFO | UART_CAP_AFE | UART_CAP_EFR,
         },
+        [PORT_LPC3220] = {
+                .name           = "LPC3220",
+                .fifo_size      = 64,
+                .tx_loadsz      = 32,
+                .fcr            = UART_FCR_DMA_SELECT | UART_FCR_ENABLE_FIFO |
+                                  UART_FCR_R_TRIG_00 | UART_FCR_T_TRIG_00,
+                .flags          = UART_CAP_FIFO,
+        },
 };
 
 /* Uart divisor latch read */
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 070b442c1f81..4720b4ba096a 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -160,10 +160,12 @@ config SERIAL_KS8695_CONSOLE
 
 config SERIAL_CLPS711X
         tristate "CLPS711X serial port support"
-        depends on ARM && ARCH_CLPS711X
+        depends on ARCH_CLPS711X
         select SERIAL_CORE
+        default y
         help
-          ::: To be written :::
+          This enables the driver for the on-chip UARTs of the Cirrus
+          Logic EP711x/EP721x/EP731x processors.
 
 config SERIAL_CLPS711X_CONSOLE
         bool "Support for console on CLPS711X serial port"
@@ -173,9 +175,7 @@ config SERIAL_CLPS711X_CONSOLE
           Even if you say Y here, the currently visible virtual console
           (/dev/tty0) will still be used as the system console by default, but
           you can alter that using a kernel command line option such as
-          "console=ttyCL1". (Try "man bootparam" or see the documentation of
-          your boot loader (lilo or loadlin) about how to pass options to the
-          kernel at boot time.)
+          "console=ttyCL1".
 
 config SERIAL_SAMSUNG
         tristate "Samsung SoC serial support"
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index c17923ec6e95..d3553b5d3fca 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -53,9 +53,9 @@
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/sizes.h>
 
 #include <asm/io.h>
-#include <asm/sizes.h>
 
 #define UART_NR                 14
 
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 144cd3987d4c..3ad079ffd049 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -1331,7 +1331,7 @@ static const struct spi_device_id ifx_id_table[] = {
 MODULE_DEVICE_TABLE(spi, ifx_id_table);
 
 /* spi operations */
-static const struct spi_driver ifx_spi_driver = {
+static struct spi_driver ifx_spi_driver = {
         .driver = {
                 .name = DRVNAME,
                 .pm = &ifx_spi_pm,
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 4ef747307ecb..d5c689d6217e 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -169,7 +169,6 @@
 #define SERIAL_IMX_MAJOR        207
 #define MINOR_START             16
 #define DEV_NAME                "ttymxc"
-#define MAX_INTERNAL_IRQ        MXC_INTERNAL_IRQS
 
 /*
  * This determines how often we check the modem status signals
@@ -741,10 +740,7 @@ static int imx_startup(struct uart_port *port)
 
                 /* do not use RTS IRQ on IrDA */
                 if (!USE_IRDA(sport)) {
-                        retval = request_irq(sport->rtsirq, imx_rtsint,
-                                     (sport->rtsirq < MAX_INTERNAL_IRQ) ? 0 :
-                                       IRQF_TRIGGER_FALLING |
-                                       IRQF_TRIGGER_RISING,
+                        retval = request_irq(sport->rtsirq, imx_rtsint, 0,
                                         DRIVER_NAME, sport);
                         if (retval)
                                 goto error_out3;
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index ec56d8397aae..3a667eed63d6 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -33,6 +33,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/of_device.h>
 
 #include <asm/cacheflush.h>
 
@@ -72,6 +73,7 @@
 #define AUART_CTRL0_CLKGATE                     (1 << 30)
 
 #define AUART_CTRL2_CTSEN                       (1 << 15)
+#define AUART_CTRL2_RTSEN                       (1 << 14)
 #define AUART_CTRL2_RTS                         (1 << 11)
 #define AUART_CTRL2_RXE                         (1 << 9)
 #define AUART_CTRL2_TXE                         (1 << 8)
@@ -258,9 +260,12 @@ static void mxs_auart_set_mctrl(struct uart_port *u, unsigned mctrl)
 
         u32 ctrl = readl(u->membase + AUART_CTRL2);
 
-        ctrl &= ~AUART_CTRL2_RTS;
-        if (mctrl & TIOCM_RTS)
-                ctrl |= AUART_CTRL2_RTS;
+        ctrl &= ~AUART_CTRL2_RTSEN;
+        if (mctrl & TIOCM_RTS) {
+                if (u->state->port.flags & ASYNC_CTS_FLOW)
+                        ctrl |= AUART_CTRL2_RTSEN;
+        }
+
         s->ctrl = mctrl;
         writel(ctrl, u->membase + AUART_CTRL2);
 }
@@ -358,9 +363,9 @@ static void mxs_auart_settermios(struct uart_port *u,
 
         /* figure out the hardware flow control settings */
         if (cflag & CRTSCTS)
-                ctrl2 |= AUART_CTRL2_CTSEN;
+                ctrl2 |= AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN;
         else
-                ctrl2 &= ~AUART_CTRL2_CTSEN;
+                ctrl2 &= ~(AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN);
 
         /* set baud rate */
         baud = uart_get_baud_rate(u, termios, old, 0, u->uartclk);
@@ -675,6 +680,30 @@ static struct uart_driver auart_driver = {
 #endif
 };
 
+/*
+ * This function returns 1 if pdev isn't a device instatiated by dt, 0 if it
+ * could successfully get all information from dt or a negative errno.
+ */
+static int serial_mxs_probe_dt(struct mxs_auart_port *s,
+                struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        int ret;
+
+        if (!np)
+                /* no device tree device */
+                return 1;
+
+        ret = of_alias_get_id(np, "serial");
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to get alias id: %d\n", ret);
+                return ret;
+        }
+        s->port.line = ret;
+
+        return 0;
+}
+
 static int __devinit mxs_auart_probe(struct platform_device *pdev)
 {
         struct mxs_auart_port *s;
@@ -689,6 +718,12 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev)
                 goto out;
         }
 
+        ret = serial_mxs_probe_dt(s, pdev);
+        if (ret > 0)
+                s->port.line = pdev->id < 0 ? 0 : pdev->id;
+        else if (ret < 0)
+                goto out_free;
+
         pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
         if (IS_ERR(pinctrl)) {
                 ret = PTR_ERR(pinctrl);
@@ -711,7 +746,6 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev)
         s->port.membase = ioremap(r->start, resource_size(r));
         s->port.ops = &mxs_auart_ops;
         s->port.iotype = UPIO_MEM;
-        s->port.line = pdev->id < 0 ? 0 : pdev->id;
         s->port.fifosize = 16;
         s->port.uartclk = clk_get_rate(s->clk);
         s->port.type = PORT_IMX;
@@ -728,7 +762,7 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, s);
 
-        auart_port[pdev->id] = s;
+        auart_port[s->port.line] = s;
 
         mxs_auart_reset(&s->port);
 
@@ -769,12 +803,19 @@ static int __devexit mxs_auart_remove(struct platform_device *pdev)
         return 0;
 }
 
+static struct of_device_id mxs_auart_dt_ids[] = {
+        { .compatible = "fsl,imx23-auart", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mxs_auart_dt_ids);
+
 static struct platform_driver mxs_auart_driver = {
         .probe = mxs_auart_probe,
         .remove = __devexit_p(mxs_auart_remove),
         .driver = {
                 .name = "mxs-auart",
                 .owner = THIS_MODULE,
+                .of_match_table = mxs_auart_dt_ids,
         },
 };
 
@@ -807,3 +848,4 @@ module_init(mxs_auart_init);
 module_exit(mxs_auart_exit);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Freescale MXS application uart driver");
+MODULE_ALIAS("platform:mxs-auart");
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 5410c0637266..34e71874a892 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -208,6 +208,7 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = {
         { .compatible = "ns16750",  .data = (void *)PORT_16750, },
         { .compatible = "ns16850",  .data = (void *)PORT_16850, },
         { .compatible = "nvidia,tegra20-uart", .data = (void *)PORT_TEGRA, },
+        { .compatible = "nxp,lpc3220-uart", .data = (void *)PORT_LPC3220, },
 #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL
         { .compatible = "ibm,qpace-nwp-serial",
                 .data = (void *)PORT_NWPSERIAL, },
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 4fdec6a6b758..558ce8509a9a 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -253,6 +253,9 @@ struct eg20t_port {
         dma_addr_t                      rx_buf_dma;
 
         struct dentry   *debugfs;
+
+        /* protect the eg20t_port private structure and io access to membase */
+        spinlock_t lock;
 };
 
 /**
@@ -754,7 +757,8 @@ static void pch_dma_rx_complete(void *arg)
                 tty_flip_buffer_push(tty);
         tty_kref_put(tty);
         async_tx_ack(priv->desc_rx);
-        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT);
+        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT |
+                                            PCH_UART_HAL_RX_ERR_INT);
 }
 
 static void pch_dma_tx_complete(void *arg)
@@ -809,7 +813,8 @@ static int handle_rx_to(struct eg20t_port *priv)
         int rx_size;
         int ret;
         if (!priv->start_rx) {
-                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT);
+                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT |
+                                                     PCH_UART_HAL_RX_ERR_INT);
                 return 0;
         }
         buf = &priv->rxbuf;
@@ -1058,7 +1063,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
         int next = 1;
         u8 msr;
 
-        spin_lock_irqsave(&priv->port.lock, flags);
+        spin_lock_irqsave(&priv->lock, flags);
         handled = 0;
         while (next) {
                 iid = pch_uart_hal_get_iid(priv);
@@ -1078,11 +1083,13 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
                 case PCH_UART_IID_RDR:  /* Received Data Ready */
                         if (priv->use_dma) {
                                 pch_uart_hal_disable_interrupt(priv,
-                                                        PCH_UART_HAL_RX_INT);
+                                                PCH_UART_HAL_RX_INT |
+                                                PCH_UART_HAL_RX_ERR_INT);
                                 ret = dma_handle_rx(priv);
                                 if (!ret)
                                         pch_uart_hal_enable_interrupt(priv,
-                                                        PCH_UART_HAL_RX_INT);
+                                                PCH_UART_HAL_RX_INT |
+                                                PCH_UART_HAL_RX_ERR_INT);
                         } else {
                                 ret = handle_rx(priv);
                         }
@@ -1116,7 +1123,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
                 handled |= (unsigned int)ret;
         }
 
-        spin_unlock_irqrestore(&priv->port.lock, flags);
+        spin_unlock_irqrestore(&priv->lock, flags);
         return IRQ_RETVAL(handled);
 }
 
@@ -1208,7 +1215,8 @@ static void pch_uart_stop_rx(struct uart_port *port)
         struct eg20t_port *priv;
         priv = container_of(port, struct eg20t_port, port);
         priv->start_rx = 0;
-        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT);
+        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT |
+                                             PCH_UART_HAL_RX_ERR_INT);
 }
 
 /* Enable the modem status interrupts. */
@@ -1226,9 +1234,9 @@ static void pch_uart_break_ctl(struct uart_port *port, int ctl)
         unsigned long flags;
 
         priv = container_of(port, struct eg20t_port, port);
-        spin_lock_irqsave(&port->lock, flags);
+        spin_lock_irqsave(&priv->lock, flags);
         pch_uart_hal_set_break(priv, ctl);
-        spin_unlock_irqrestore(&port->lock, flags);
+        spin_unlock_irqrestore(&priv->lock, flags);
 }
 
 /* Grab any interrupt resources and initialise any low level driver state. */
@@ -1263,6 +1271,7 @@ static int pch_uart_startup(struct uart_port *port)
                 break;
         case 16:
                 fifo_size = PCH_UART_HAL_FIFO16;
+                break;
         case 1:
         default:
                 fifo_size = PCH_UART_HAL_FIFO_DIS;
@@ -1300,7 +1309,8 @@ static int pch_uart_startup(struct uart_port *port)
                 pch_request_dma(port);
 
         priv->start_rx = 1;
-        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT);
+        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT |
+                                            PCH_UART_HAL_RX_ERR_INT);
         uart_update_timeout(port, CS8, default_baud);
 
         return 0;
@@ -1358,7 +1368,7 @@ static void pch_uart_set_termios(struct uart_port *port,
                 stb = PCH_UART_HAL_STB1;
 
         if (termios->c_cflag & PARENB) {
-                if (!(termios->c_cflag & PARODD))
+                if (termios->c_cflag & PARODD)
                         parity = PCH_UART_HAL_PARITY_ODD;
                 else
                         parity = PCH_UART_HAL_PARITY_EVEN;
@@ -1376,7 +1386,8 @@ static void pch_uart_set_termios(struct uart_port *port,
 
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16);
 
-        spin_lock_irqsave(&port->lock, flags);
+        spin_lock_irqsave(&priv->lock, flags);
+        spin_lock(&port->lock);
 
         uart_update_timeout(port, termios->c_cflag, baud);
         rtn = pch_uart_hal_set_line(priv, baud, parity, bits, stb);
@@ -1389,7 +1400,8 @@ static void pch_uart_set_termios(struct uart_port *port,
                 tty_termios_encode_baud_rate(termios, baud, baud);
 
 out:
-        spin_unlock_irqrestore(&port->lock, flags);
+        spin_unlock(&port->lock);
+        spin_unlock_irqrestore(&priv->lock, flags);
 }
 
 static const char *pch_uart_type(struct uart_port *port)
@@ -1538,8 +1550,9 @@ pch_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct eg20t_port *priv;
         unsigned long flags;
+        int priv_locked = 1;
+        int port_locked = 1;
         u8 ier;
-        int locked = 1;
 
         priv = pch_uart_ports[co->index];
 
@@ -1547,12 +1560,16 @@ pch_console_write(struct console *co, const char *s, unsigned int count)
 
         local_irq_save(flags);
         if (priv->port.sysrq) {
-                /* serial8250_handle_port() already took the lock */
-                locked = 0;
+                spin_lock(&priv->lock);
+                /* serial8250_handle_port() already took the port lock */
+                port_locked = 0;
         } else if (oops_in_progress) {
-                locked = spin_trylock(&priv->port.lock);
-        } else
+                priv_locked = spin_trylock(&priv->lock);
+                port_locked = spin_trylock(&priv->port.lock);
+        } else {
+                spin_lock(&priv->lock);
                 spin_lock(&priv->port.lock);
+        }
 
         /*
          *      First save the IER then disable the interrupts
@@ -1570,8 +1587,10 @@ pch_console_write(struct console *co, const char *s, unsigned int count)
         wait_for_xmitr(priv, BOTH_EMPTY);
         iowrite8(ier, priv->membase + UART_IER);
 
-        if (locked)
+        if (port_locked)
                 spin_unlock(&priv->port.lock);
+        if (priv_locked)
+                spin_unlock(&priv->lock);
         local_irq_restore(flags);
 }
 
@@ -1669,6 +1688,8 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         pci_enable_msi(pdev);
         pci_set_master(pdev);
 
+        spin_lock_init(&priv->lock);
+
         iobase = pci_resource_start(pdev, 0);
         mapbase = pci_resource_start(pdev, 1);
         priv->mapbase = mapbase;
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 654755a990df..333c8d012b0e 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1348,10 +1348,16 @@ static int pmz_verify_port(struct uart_port *port, struct serial_struct *ser)
 static int pmz_poll_get_char(struct uart_port *port)
 {
         struct uart_pmac_port *uap = (struct uart_pmac_port *)port;
+        int tries = 2;
 
-        while ((read_zsreg(uap, R0) & Rx_CH_AV) == 0)
-                udelay(5);
-        return read_zsdata(uap);
+        while (tries) {
+                if ((read_zsreg(uap, R0) & Rx_CH_AV) != 0)
+                        return read_zsdata(uap);
+                if (tries--)
+                        udelay(5);
+        }
+
+        return NO_POLL_CHAR;
 }
 
 static void pmz_poll_put_char(struct uart_port *port, unsigned char c)
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index d8b0aee35632..02d07bfcfa8a 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1014,10 +1014,10 @@ static int s3c24xx_serial_cpufreq_transition(struct notifier_block *nb,
          * a disturbance in the clock-rate over the change.
          */
 
-        if (IS_ERR(port->clk))
+        if (IS_ERR(port->baudclk))
                 goto exit;
 
-        if (port->baudclk_rate == clk_get_rate(port->clk))
+        if (port->baudclk_rate == clk_get_rate(port->baudclk))
                 goto exit;
 
         if (val == CPUFREQ_PRECHANGE) {
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 246b823c1b27..a21dc8e3b7c0 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2527,14 +2527,16 @@ void uart_insert_char(struct uart_port *port, unsigned int status,
         struct tty_struct *tty = port->state->port.tty;
 
         if ((status & port->ignore_status_mask & ~overrun) == 0)
-                tty_insert_flip_char(tty, ch, flag);
+                if (tty_insert_flip_char(tty, ch, flag) == 0)
+                        ++port->icount.buf_overrun;
 
         /*
          * Overrun is special.  Since it's reported immediately,
          * it doesn't affect the current character.
          */
         if (status & ~port->ignore_status_mask & overrun)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                if (tty_insert_flip_char(tty, 0, TTY_OVERRUN) == 0)
+                        ++port->icount.buf_overrun;
 }
 EXPORT_SYMBOL_GPL(uart_insert_char);
 
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 1bd9163bc118..9be296cf7295 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -25,6 +25,7 @@
 
 #include <linux/module.h>
 #include <linux/errno.h>
+#include <linux/sh_dma.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
@@ -1410,8 +1411,8 @@ static void work_fn_rx(struct work_struct *work)
                 /* Handle incomplete DMA receive */
                 struct tty_struct *tty = port->state->port.tty;
                 struct dma_chan *chan = s->chan_rx;
-                struct sh_desc *sh_desc = container_of(desc, struct sh_desc,
-                                                       async_tx);
+                struct shdma_desc *sh_desc = container_of(desc,
+                                        struct shdma_desc, async_tx);
                 unsigned long flags;
                 int count;
 
@@ -1615,9 +1616,9 @@ static bool filter(struct dma_chan *chan, void *slave)
         struct sh_dmae_slave *param = slave;
 
         dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__,
-                param->slave_id);
+                param->shdma_slave.slave_id);
 
-        chan->private = param;
+        chan->private = &param->shdma_slave;
         return true;
 }
 
@@ -1656,7 +1657,7 @@ static void sci_request_dma(struct uart_port *port)
         param = &s->param_tx;
 
         /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_TX */
-        param->slave_id = s->cfg->dma_slave_tx;
+        param->shdma_slave.slave_id = s->cfg->dma_slave_tx;
 
         s->cookie_tx = -EINVAL;
         chan = dma_request_channel(mask, filter, param);
@@ -1684,7 +1685,7 @@ static void sci_request_dma(struct uart_port *port)
         param = &s->param_rx;
 
         /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_RX */
-        param->slave_id = s->cfg->dma_slave_rx;
+        param->shdma_slave.slave_id = s->cfg->dma_slave_rx;
 
         chan = dma_request_channel(mask, filter, param);
         dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 6cd414341d5e..6579ffdd8e9b 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -216,8 +216,7 @@ static int ulite_startup(struct uart_port *port)
 {
         int ret;
 
-        ret = request_irq(port->irq, ulite_isr,
-                          IRQF_SHARED | IRQF_SAMPLE_RANDOM, "uartlite", port);
+        ret = request_irq(port->irq, ulite_isr, IRQF_SHARED, "uartlite", port);
         if (ret)
                 return ret;
 
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 9911eb6b34cd..6f99c9959f0c 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -659,7 +659,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
                 goto enable;
         }
 
-        if (test_bit(TTY_HUPPED, &tty->flags)) {
+        if (test_bit(TTY_HUPPING, &tty->flags)) {
                 /* We were raced by the hangup method. It will have stomped
                    the ldisc data and closed the ldisc down */
                 clear_bit(TTY_LDISC_CHANGING, &tty->flags);
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 64618547be11..b841f56d2e66 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -110,16 +110,7 @@ void vt_event_post(unsigned int event, unsigned int old, unsigned int new)
                 wake_up_interruptible(&vt_event_waitqueue);
 }
 
-/**
- *      vt_event_wait           -       wait for an event
- *      @vw: our event
- *
- *      Waits for an event to occur which completes our vt_event_wait
- *      structure. On return the structure has wv->done set to 1 for success
- *      or 0 if some event such as a signal ended the wait.
- */
-
-static void vt_event_wait(struct vt_event_wait *vw)
+static void __vt_event_queue(struct vt_event_wait *vw)
 {
         unsigned long flags;
         /* Prepare the event */
@@ -129,8 +120,18 @@ static void vt_event_wait(struct vt_event_wait *vw)
         spin_lock_irqsave(&vt_event_lock, flags);
         list_add(&vw->list, &vt_events);
         spin_unlock_irqrestore(&vt_event_lock, flags);
+}
+
+static void __vt_event_wait(struct vt_event_wait *vw)
+{
         /* Wait for it to pass */
         wait_event_interruptible(vt_event_waitqueue, vw->done);
+}
+
+static void __vt_event_dequeue(struct vt_event_wait *vw)
+{
+        unsigned long flags;
+
         /* Dequeue it */
         spin_lock_irqsave(&vt_event_lock, flags);
         list_del(&vw->list);
@@ -138,6 +139,22 @@ static void vt_event_wait(struct vt_event_wait *vw)
 }
 
 /**
+ *      vt_event_wait           -       wait for an event
+ *      @vw: our event
+ *
+ *      Waits for an event to occur which completes our vt_event_wait
+ *      structure. On return the structure has wv->done set to 1 for success
+ *      or 0 if some event such as a signal ended the wait.
+ */
+
+static void vt_event_wait(struct vt_event_wait *vw)
+{
+        __vt_event_queue(vw);
+        __vt_event_wait(vw);
+        __vt_event_dequeue(vw);
+}
+
+/**
  *      vt_event_wait_ioctl     -       event ioctl handler
  *      @arg: argument to ioctl
  *
@@ -177,10 +194,14 @@ int vt_waitactive(int n)
 {
         struct vt_event_wait vw;
         do {
-                if (n == fg_console + 1)
-                        break;
                 vw.event.event = VT_EVENT_SWITCH;
-                vt_event_wait(&vw);
+                __vt_event_queue(&vw);
+                if (n == fg_console + 1) {
+                        __vt_event_dequeue(&vw);
+                        break;
+                }
+                __vt_event_wait(&vw);
+                __vt_event_dequeue(&vw);
                 if (vw.done == 0)
                         return -EINTR;
         } while (vw.event.newev != n);