Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg Kroah-Hartman:
 "Here's the driver core, and other driver subsystems, pull request for
  the 3.5-rc1 merge window.

  Outside of a few minor driver core changes, we ended up with the
  following different subsystem and core changes as well, due to
  interdependancies on the driver core:
   - hyperv driver updates
   - drivers/memory being created and some drivers moved into it
   - extcon driver subsystem created out of the old Android staging
     switch driver code
   - dynamic debug updates
   - printk rework, and /dev/kmsg changes

  All of this has been tested in the linux-next releases for a few weeks
  with no reported problems.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fix up conflicts in drivers/extcon/extcon-max8997.c where git noticed
that a patch to the deleted drivers/misc/max8997-muic.c driver needs to
be applied to this one.

* tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)
  uio_pdrv_genirq: get irq through platform resource if not set otherwise
  memory: tegra{20,30}-mc: Remove empty *_remove()
  printk() - isolate KERN_CONT users from ordinary complete lines
  sysfs: get rid of some lockdep false positives
  Drivers: hv: util: Properly handle version negotiations.
  Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()
  memory: tegra{20,30}-mc: Use dev_err_ratelimited()
  driver core: Add dev_*_ratelimited() family
  Driver Core: don't oops with unregistered driver in driver_find_device()
  printk() - restore prefix/timestamp printing for multi-newline strings
  printk: add stub for prepend_timestamp()
  ARM: tegra30: Make MC optional in Kconfig
  ARM: tegra20: Make MC optional in Kconfig
  ARM: tegra30: MC: Remove unnecessary BUG*()
  ARM: tegra20: MC: Remove unnecessary BUG*()
  printk: correctly align __log_buf
  ARM: tegra30: Add Tegra Memory Controller(MC) driver
  ARM: tegra20: Add Tegra Memory Controller(MC) driver
  printk() - restore timestamp printing at console output
  printk() - do not merge continuation lines of different threads
  ...

1 files changed, 3 insertions, 39 deletions

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index d6e9d081c8b1..67c3371723cc 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -807,44 +807,6 @@ static const struct file_operations oldmem_fops = {
 };
 #endif
 
-static ssize_t kmsg_writev(struct kiocb *iocb, const struct iovec *iv,
-                           unsigned long count, loff_t pos)
-{
-        char *line, *p;
-        int i;
-        ssize_t ret = -EFAULT;
-        size_t len = iov_length(iv, count);
-
-        line = kmalloc(len + 1, GFP_KERNEL);
-        if (line == NULL)
-                return -ENOMEM;
-
-        /*
-         * copy all vectors into a single string, to ensure we do
-         * not interleave our log line with other printk calls
-         */
-        p = line;
-        for (i = 0; i < count; i++) {
-                if (copy_from_user(p, iv[i].iov_base, iv[i].iov_len))
-                        goto out;
-                p += iv[i].iov_len;
-        }
-        p[0] = '\0';
-
-        ret = printk("%s", line);
-        /* printk can add a prefix */
-        if (ret > len)
-                ret = len;
-out:
-        kfree(line);
-        return ret;
-}
-
-static const struct file_operations kmsg_fops = {
-        .aio_write = kmsg_writev,
-        .llseek = noop_llseek,
-};
-
 static const struct memdev {
         const char *name;
         umode_t mode;
@@ -863,7 +825,9 @@ static const struct memdev {
          [7] = { "full", 0666, &full_fops, NULL },
          [8] = { "random", 0666, &random_fops, NULL },
          [9] = { "urandom", 0666, &urandom_fops, NULL },
-        [11] = { "kmsg", 0, &kmsg_fops, NULL },
+#ifdef CONFIG_PRINTK
+        [11] = { "kmsg", 0644, &kmsg_fops, NULL },
+#endif
 #ifdef CONFIG_CRASH_DUMP
         [12] = { "oldmem", 0, &oldmem_fops, NULL },
 #endif