Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 22239e988498..c24ec2d5f926 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -10,6 +10,8 @@
  * (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <asm/io.h>
 #include <asm/system.h>
 #include <linux/delay.h>
@@ -178,7 +180,6 @@ static void joydev_attach_client(struct joydev *joydev,
         spin_lock(&joydev->client_lock);
         list_add_tail_rcu(&client->node, &joydev->client_list);
         spin_unlock(&joydev->client_lock);
-        synchronize_rcu();
 }
 
 static void joydev_detach_client(struct joydev *joydev,
@@ -739,6 +740,7 @@ static const struct file_operations joydev_fops = {
         .compat_ioctl   = joydev_compat_ioctl,
 #endif
         .fasync         = joydev_fasync,
+        .llseek         = no_llseek,
 };
 
 static int joydev_install_chrdev(struct joydev *joydev)
@@ -755,7 +757,7 @@ static void joydev_remove_chrdev(struct joydev *joydev)
 }
 
 /*
- * Mark device non-existant. This disables writes, ioctls and
+ * Mark device non-existent. This disables writes, ioctls and
  * prevents new users from opening the device. Already posted
  * blocking reads will stay, however new ones will fail.
  */
@@ -774,7 +776,7 @@ static void joydev_cleanup(struct joydev *joydev)
         joydev_hangup(joydev);
         joydev_remove_chrdev(joydev);
 
-        /* joydev is marked dead so noone else accesses joydev->open */
+        /* joydev is marked dead so no one else accesses joydev->open */
         if (joydev->open)
                 input_close_device(handle);
 }
@@ -805,7 +807,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
                         break;
 
         if (minor == JOYDEV_MINORS) {
-                printk(KERN_ERR "joydev: no more free joydev devices\n");
+                pr_err("no more free joydev devices\n");
                 return -ENFILE;
         }