Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)
  debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
  sysfs: remove "last sysfs file:" line from the oops messages
  drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION"
  memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION
  SYSFS: Fix erroneous comments for sysfs_update_group().
  driver core: remove the driver-model structures from the documentation
  driver core: Add the device driver-model structures to kerneldoc
  Translated Documentation/email-clients.txt
  RAW driver: Remove call to kobject_put().
  reboot: disable usermodehelper to prevent fs access
  efivars: prevent oops on unload when efi is not enabled
  Allow setting of number of raw devices as a module parameter
  Introduce CONFIG_GOOGLE_FIRMWARE
  driver: Google Memory Console
  driver: Google EFI SMI
  x86: Better comments for get_bios_ebda()
  x86: get_bios_ebda_length()
  misc: fix ti-st build issues
  params.c: Use new strtobool function to process boolean inputs
  debugfs: move to new strtobool
  ...

Fix up trivial conflicts in fs/debugfs/file.c due to the same patch
being applied twice, and an unrelated cleanup nearby.

3 files changed, 55 insertions, 23 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ad59b4e0a9b5..49502bc5360a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -523,7 +523,7 @@ config RAW_DRIVER
           with the O_DIRECT flag.
 
 config MAX_RAW_DEVS
-        int "Maximum number of RAW devices to support (1-8192)"
+        int "Maximum number of RAW devices to support (1-65536)"
         depends on RAW_DRIVER
         default "256"
         help
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 436a99017998..8fc04b4f311f 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -806,29 +806,41 @@ static const struct file_operations oldmem_fops = {
 };
 #endif
 
-static ssize_t kmsg_write(struct file *file, const char __user *buf,
-                          size_t count, loff_t *ppos)
+static ssize_t kmsg_writev(struct kiocb *iocb, const struct iovec *iv,
+                           unsigned long count, loff_t pos)
 {
-        char *tmp;
-        ssize_t ret;
+        char *line, *p;
+        int i;
+        ssize_t ret = -EFAULT;
+        size_t len = iov_length(iv, count);
 
-        tmp = kmalloc(count + 1, GFP_KERNEL);
-        if (tmp == NULL)
+        line = kmalloc(len + 1, GFP_KERNEL);
+        if (line == NULL)
                 return -ENOMEM;
-        ret = -EFAULT;
-        if (!copy_from_user(tmp, buf, count)) {
-                tmp[count] = 0;
-                ret = printk("%s", tmp);
-                if (ret > count)
-                        /* printk can add a prefix */
-                        ret = count;
+
+        /*
+         * 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;
         }
-        kfree(tmp);
+        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 = {
-        .write = kmsg_write,
+        .aio_write = kmsg_writev,
         .llseek = noop_llseek,
 };
 
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index b4b9d5a47885..b33e8ea314ed 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -21,6 +21,7 @@
 #include <linux/mutex.h>
 #include <linux/gfp.h>
 #include <linux/compat.h>
+#include <linux/vmalloc.h>
 
 #include <asm/uaccess.h>
 
@@ -30,10 +31,15 @@ struct raw_device_data {
 };
 
 static struct class *raw_class;
-static struct raw_device_data raw_devices[MAX_RAW_MINORS];
+static struct raw_device_data *raw_devices;
 static DEFINE_MUTEX(raw_mutex);
 static const struct file_operations raw_ctl_fops; /* forward declaration */
 
+static int max_raw_minors = MAX_RAW_MINORS;
+
+module_param(max_raw_minors, int, 0);
+MODULE_PARM_DESC(max_raw_minors, "Maximum number of raw devices (1-65536)");
+
 /*
  * Open/close code for raw IO.
  *
@@ -125,7 +131,7 @@ static int bind_set(int number, u64 major, u64 minor)
         struct raw_device_data *rawdev;
         int err = 0;
 
-        if (number <= 0 || number >= MAX_RAW_MINORS)
+        if (number <= 0 || number >= max_raw_minors)
                 return -EINVAL;
 
         if (MAJOR(dev) != major || MINOR(dev) != minor)
@@ -312,14 +318,27 @@ static int __init raw_init(void)
         dev_t dev = MKDEV(RAW_MAJOR, 0);
         int ret;
 
-        ret = register_chrdev_region(dev, MAX_RAW_MINORS, "raw");
+        if (max_raw_minors < 1 || max_raw_minors > 65536) {
+                printk(KERN_WARNING "raw: invalid max_raw_minors (must be"
+                        " between 1 and 65536), using %d\n", MAX_RAW_MINORS);
+                max_raw_minors = MAX_RAW_MINORS;
+        }
+
+        raw_devices = vmalloc(sizeof(struct raw_device_data) * max_raw_minors);
+        if (!raw_devices) {
+                printk(KERN_ERR "Not enough memory for raw device structures\n");
+                ret = -ENOMEM;
+                goto error;
+        }
+        memset(raw_devices, 0, sizeof(struct raw_device_data) * max_raw_minors);
+
+        ret = register_chrdev_region(dev, max_raw_minors, "raw");
         if (ret)
                 goto error;
 
         cdev_init(&raw_cdev, &raw_fops);
-        ret = cdev_add(&raw_cdev, dev, MAX_RAW_MINORS);
+        ret = cdev_add(&raw_cdev, dev, max_raw_minors);
         if (ret) {
-                kobject_put(&raw_cdev.kobj);
                 goto error_region;
         }
 
@@ -336,8 +355,9 @@ static int __init raw_init(void)
         return 0;
 
 error_region:
-        unregister_chrdev_region(dev, MAX_RAW_MINORS);
+        unregister_chrdev_region(dev, max_raw_minors);
 error:
+        vfree(raw_devices);
         return ret;
 }
 
@@ -346,7 +366,7 @@ static void __exit raw_exit(void)
         device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));
         class_destroy(raw_class);
         cdev_del(&raw_cdev);
-        unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), MAX_RAW_MINORS);
+        unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), max_raw_minors);
 }
 
 module_init(raw_init);