summaryrefslogtreecommitdiffstats
path: root/drivers/char/misc.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-10-10 15:35:43 +0000
committerThomas Gleixner <tglx@linutronix.de>2009-10-14 17:33:32 +0200
commit40b798efe3460797a4ac928ee2e038774e2758eb (patch)
tree1acade9e91b9bf2c465d293dcfc383a236d616fa /drivers/char/misc.c
parent80f506918fdaaca6b574ba931536a58ce015c7be (diff)
downloadlinux-40b798efe3460797a4ac928ee2e038774e2758eb.tar.bz2
drivers: Remove BKL from misc_open
misc_open() is already serialized with misc_mtx. Remove the BKL locking which got there via the BKL pushdown. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Greg Kroah-Hartman <gregkh@suse.de> LKML-Reference: <20091010153349.237173041@linutronix.de>
Diffstat (limited to 'drivers/char/misc.c')
-rw-r--r--drivers/char/misc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 07fa612a58d5..96f1cd086dd2 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -49,7 +49,6 @@
#include <linux/device.h>
#include <linux/tty.h>
#include <linux/kmod.h>
-#include <linux/smp_lock.h>
/*
* Head entry for the doubly linked miscdevice list
@@ -118,8 +117,7 @@ static int misc_open(struct inode * inode, struct file * file)
struct miscdevice *c;
int err = -ENODEV;
const struct file_operations *old_fops, *new_fops = NULL;
-
- lock_kernel();
+
mutex_lock(&misc_mtx);
list_for_each_entry(c, &misc_list, list) {
@@ -157,7 +155,6 @@ static int misc_open(struct inode * inode, struct file * file)
fops_put(old_fops);
fail:
mutex_unlock(&misc_mtx);
- unlock_kernel();
return err;
}