From e0e4f77eb2f728989651f1df80370b92b2b36d55 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:53 +0200
Subject: [PATCH] --- yaml --- r: 100387 b: refs/heads/master c:
 8702965848ed4bee27486a3e3d2ae34ebba6dd83 h: refs/heads/master i:   100385:
 633975ec1f4e49bbbceca5cb85be4ab10238a032   100383:
 28cf38722093c8115fc2877f1551620c7f6798ac v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/input/misc/uinput.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b14235030b86..363e9617e59e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f138e4814a9c28bc44d967a8effdd977ac00fc6e
+refs/heads/master: 8702965848ed4bee27486a3e3d2ae34ebba6dd83
diff --git a/trunk/drivers/input/misc/uinput.c b/trunk/drivers/input/misc/uinput.c
index a56ad4ba8fe2..2bcfa0b35061 100644
--- a/trunk/drivers/input/misc/uinput.c
+++ b/trunk/drivers/input/misc/uinput.c
@@ -37,6 +37,7 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/uinput.h>
+#include <linux/smp_lock.h>
 
 static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
@@ -222,6 +223,7 @@ static int uinput_open(struct inode *inode, struct file *file)
 	if (!newdev)
 		return -ENOMEM;
 
+	lock_kernel();
 	mutex_init(&newdev->mutex);
 	spin_lock_init(&newdev->requests_lock);
 	init_waitqueue_head(&newdev->requests_waitq);
@@ -229,6 +231,7 @@ static int uinput_open(struct inode *inode, struct file *file)
 	newdev->state = UIST_NEW_DEVICE;
 
 	file->private_data = newdev;
+	unlock_kernel();
 
 	return 0;
 }