summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>2010-01-29 23:53:57 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-29 23:55:18 -0800
commit45cdba4d376adfd30cfbda1b7d43110818d967cc (patch)
tree9e20c5dfd6ba29a597345fb2f7cc6aca242a7bbc
parentdcfc32babbece923381bd3bffaf17373b5d97568 (diff)
downloadop-kernel-dev-45cdba4d376adfd30cfbda1b7d43110818d967cc.zip
op-kernel-dev-45cdba4d376adfd30cfbda1b7d43110818d967cc.tar.gz
Input: uinput - remove BKL from uinput_open function
Commit 8702965848ed4bee27486a3e3d2ae34ebba6dd83 pushed down the BKL into uinput open function. However, there's nothing that needs locking in there. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/misc/uinput.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index d3f5724..18206e1 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -34,7 +34,6 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/smp_lock.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
#include <linux/uinput.h>
@@ -284,7 +283,6 @@ 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);
@@ -292,7 +290,6 @@ static int uinput_open(struct inode *inode, struct file *file)
newdev->state = UIST_NEW_DEVICE;
file->private_data = newdev;
- unlock_kernel();
return 0;
}
OpenPOWER on IntegriCloud