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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index d528a2dba064..0110b5a3a167 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -9,6 +9,8 @@
  * the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define MOUSEDEV_MINOR_BASE     32
 #define MOUSEDEV_MINORS         32
 #define MOUSEDEV_MIX            31
@@ -185,7 +187,7 @@ static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev,
                 if (size == 0)
                         size = xres ? : 1;
 
-                clamp(value, min, max);
+                value = clamp(value, min, max);
 
                 mousedev->packet.x = ((value - min) * xres) / size;
                 mousedev->packet.abs_event = 1;
@@ -199,7 +201,7 @@ static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev,
                 if (size == 0)
                         size = yres ? : 1;
 
-                clamp(value, min, max);
+                value = clamp(value, min, max);
 
                 mousedev->packet.y = yres - ((value - min) * yres) / size;
                 mousedev->packet.abs_event = 1;
@@ -506,7 +508,6 @@ static void mousedev_attach_client(struct mousedev *mousedev,
         spin_lock(&mousedev->client_lock);
         list_add_tail_rcu(&client->node, &mousedev->client_list);
         spin_unlock(&mousedev->client_lock);
-        synchronize_rcu();
 }
 
 static void mousedev_detach_client(struct mousedev *mousedev,
@@ -792,6 +793,7 @@ static const struct file_operations mousedev_fops = {
         .open =         mousedev_open,
         .release =      mousedev_release,
         .fasync =       mousedev_fasync,
+        .llseek = noop_llseek,
 };
 
 static int mousedev_install_chrdev(struct mousedev *mousedev)
@@ -866,7 +868,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev,
         spin_lock_init(&mousedev->client_lock);
         mutex_init(&mousedev->mutex);
         lockdep_set_subclass(&mousedev->mutex,
-                             minor == MOUSEDEV_MIX ? MOUSEDEV_MIX : 0);
+                             minor == MOUSEDEV_MIX ? SINGLE_DEPTH_NESTING : 0);
         init_waitqueue_head(&mousedev->wait);
 
         if (minor == MOUSEDEV_MIX)
@@ -976,7 +978,7 @@ static int mousedev_connect(struct input_handler *handler,
                         break;
 
         if (minor == MOUSEDEV_MINORS) {
-                printk(KERN_ERR "mousedev: no more free mousedev devices\n");
+                pr_err("no more free mousedev devices\n");
                 return -ENFILE;
         }
 
@@ -1086,13 +1088,13 @@ static int __init mousedev_init(void)
 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
         error = misc_register(&psaux_mouse);
         if (error)
-                printk(KERN_WARNING "mice: could not register psaux device, "
-                        "error: %d\n", error);
+                pr_warning("could not register psaux device, error: %d\n",
+                           error);
         else
                 psaux_registered = 1;
 #endif
 
-        printk(KERN_INFO "mice: PS/2 mouse device common for all mice\n");
+        pr_info("PS/2 mouse device common for all mice\n");
 
         return 0;
 }