Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc arch/x86/include/asm/mrst.h
Simple merge

diff --cc drivers/tty/serial/Kconfig
index 45c5758f76904bb58728d636f7e93cd3b24a22fe,925a1e547a834f10942ab878357a0568254b6ae8..705d2dc39c9ac78e23df713fccd107cc16e3addb
--- 1/drivers/tty/serial/Kconfig
--- 2/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -1589,22 -1568,13 +1589,22 @@@ config SERIAL_PCH_UAR
          which is an IOH(Input/Output Hub) for x86 embedded processor.
          Enabling PCH_DMA, this PCH UART works as DMA mode.
  
-         This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
-         Output Hub), ML7213 and ML7223.
-         ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
-         for MP(Media Phone) use.
-         ML7213/ML7223 is companion chip for Intel Atom E6xx series.
-         ML7213/ML7223 is completely compatible for Intel EG20T PCH.
+         This driver also can be used for LAPIS Semiconductor IOH(Input/
+         Output Hub), ML7213, ML7223 and ML7831.
+         ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is
+         for MP(Media Phone) use and ML7831 IOH is for general purpose use.
+         ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
+         ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
  
 +config SERIAL_PCH_UART_CONSOLE
 +      bool "Support for console on Intel EG20T PCH UART/OKI SEMICONDUCTOR ML7213 IOH"
 +      depends on SERIAL_PCH_UART=y
 +      select SERIAL_CORE_CONSOLE
 +      help
 +        Say Y here if you wish to use the PCH UART as the system console
 +        (the system  console is the device which receives all kernel messages and
 +        warnings and which allows logins in single user mode).
 +
  config SERIAL_MSM_SMD
        bool "Enable tty device interface for some SMD ports"
        default n

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge

diff --cc drivers/tty/serial/mfd.c
Simple merge

diff --cc drivers/tty/serial/pch_uart.c
index b950d059a78141d90697a1a951c3f3401c75af6c,d6aba8c087e4784370648976c0d018a569c374f4..de0f613ed6f56051df309abc3ad25ea804081006
--- 1/drivers/tty/serial/pch_uart.c
--- 2/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@@ -277,11 -272,10 +279,13 @@@ static struct pch_uart_driver_data drv_
        [pch_ml7213_uart2] = {PCH_UART_2LINE, 2},
        [pch_ml7223_uart0] = {PCH_UART_8LINE, 0},
        [pch_ml7223_uart1] = {PCH_UART_2LINE, 1},
+       [pch_ml7831_uart0] = {PCH_UART_8LINE, 0},
+       [pch_ml7831_uart1] = {PCH_UART_2LINE, 1},
  };
  
 +#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
 +static struct eg20t_port *pch_uart_ports[PCH_UART_NR];
 +#endif
  static unsigned int default_baud = 9600;
  static const int trigger_level_256[4] = { 1, 64, 128, 224 };
  static const int trigger_level_64[4] = { 1, 16, 32, 56 };

diff --cc drivers/tty/tty_ldisc.c
index 174db3b0c09e634ec42a8d4747ac83bb99640062,8e0924f55446f963b8b9d79a0d66347d30c982bc..24b95db75d84f8d6f42705bdfb57b622abcce322
--- 1/drivers/tty/tty_ldisc.c
--- 2/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@@ -16,8 -24,19 +16,9 @@@
  #include <linux/device.h>
  #include <linux/wait.h>
  #include <linux/bitops.h>
 -#include <linux/delay.h>
  #include <linux/seq_file.h>
 -
  #include <linux/uaccess.h>
 -#include <asm/system.h>
 -
 -#include <linux/kbd_kern.h>
 -#include <linux/vt_kern.h>
 -#include <linux/selection.h>
 -
 -#include <linux/kmod.h>
 -#include <linux/nsproxy.h>
+ #include <linux/ratelimit.h>
  
  /*
   *    This guards the refcounted line discipline lists. The lock
@@@ -533,11 -553,13 +535,11 @@@ static void tty_ldisc_flush_works(struc
   *    Wait for the line discipline to become idle. The discipline must
   *    have been halted for this to guarantee it remains idle.
   */
- static int tty_ldisc_wait_idle(struct tty_struct *tty)
+ static int tty_ldisc_wait_idle(struct tty_struct *tty, long timeout)
  {
-       int ret;
+       long ret;
        ret = wait_event_timeout(tty_ldisc_idle,
-                       atomic_read(&tty->ldisc->users) == 1, 5 * HZ);
+                       atomic_read(&tty->ldisc->users) == 1, timeout);
 -      if (ret < 0)
 -              return ret;
        return ret > 0 ? 0 : -EBUSY;
  }