Commit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200 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@xxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> LKML-Reference: <20091010153349.237173041@xxxxxxxxxxxxx> --- drivers/char/misc.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 07fa612..96f1cd0 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html