Merge commit 'c104f1fa1ecf4ee0fc06e31b1f77630b2551be81' into stable/for-linus-3.4

* commit 'c104f1fa1ecf4ee0fc06e31b1f77630b2551be81': (14566 commits)
  cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS
  sparc64: Eliminate obsolete __handle_softirq() function
  sparc64: Fix bootup crash on sun4v.
  kconfig: delete last traces of __enabled_ from autoconf.h
  Revert "kconfig: fix __enabled_ macros definition for invisible and un-selected symbols"
  kconfig: fix IS_ENABLED to not require all options to be defined
  irq_domain: fix type mismatch in debugfs output format
  staging: android: fix mem leaks in __persistent_ram_init()
  staging: vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl()
  staging: iio: hmc5843: Fix crash in probe function.
  panic: fix stack dump print on direct call to panic()
  drivers/rtc/rtc-pl031.c: enable clock on all ST variants
  Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()"
  hugetlb: fix race condition in hugetlb_fault()
  drivers/rtc/rtc-twl.c: use static register while reading time
  drivers/rtc/rtc-s3c.c: add placeholder for driver private data
  drivers/rtc/rtc-s3c.c: fix compilation error
  MAINTAINERS: add PCDP console maintainer
  memcg: do not open code accesses to res_counter members
  drivers/rtc/rtc-efi.c: fix section mismatch warning
  ...

1 files changed, 30 insertions, 8 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 9543b19d410c..b32ccb461019 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -39,6 +39,7 @@
 #include <linux/serial.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
+#include <linux/serial.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/uaccess.h>
@@ -508,17 +509,12 @@ static int acm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
         if (!acm)
                 return -ENODEV;
 
-        retval = tty_init_termios(tty);
+        retval = tty_standard_install(driver, tty);
         if (retval)
                 goto error_init_termios;
 
         tty->driver_data = acm;
 
-        /* Final install (we use the default method) */
-        tty_driver_kref_get(driver);
-        tty->count++;
-        driver->ttys[tty->index] = tty;
-
         return 0;
 
 error_init_termios:
@@ -773,10 +769,37 @@ static int acm_tty_tiocmset(struct tty_struct *tty,
         return acm_set_control(acm, acm->ctrlout = newctrl);
 }
 
+static int get_serial_info(struct acm *acm, struct serial_struct __user *info)
+{
+        struct serial_struct tmp;
+
+        if (!info)
+                return -EINVAL;
+
+        memset(&tmp, 0, sizeof(tmp));
+        tmp.flags = ASYNC_LOW_LATENCY;
+        tmp.xmit_fifo_size = acm->writesize;
+        tmp.baud_base = le32_to_cpu(acm->line.dwDTERate);
+
+        if (copy_to_user(info, &tmp, sizeof(tmp)))
+                return -EFAULT;
+        else
+                return 0;
+}
+
 static int acm_tty_ioctl(struct tty_struct *tty,
                                         unsigned int cmd, unsigned long arg)
 {
-        return -ENOIOCTLCMD;
+        struct acm *acm = tty->driver_data;
+        int rv = -ENOIOCTLCMD;
+
+        switch (cmd) {
+        case TIOCGSERIAL: /* gets serial port data */
+                rv = get_serial_info(acm, (struct serial_struct __user *) arg);
+                break;
+        }
+
+        return rv;
 }
 
 static const __u32 acm_tty_speed[] = {
@@ -1675,7 +1698,6 @@ static int __init acm_init(void)
         acm_tty_driver = alloc_tty_driver(ACM_TTY_MINORS);
         if (!acm_tty_driver)
                 return -ENOMEM;
-        acm_tty_driver->owner = THIS_MODULE,
         acm_tty_driver->driver_name = "acm",
         acm_tty_driver->name = "ttyACM",
         acm_tty_driver->major = ACM_TTY_MAJOR,