epca: Kill the big kernel lock
authorAlan Cox <alan@linux.intel.com>
Tue, 1 Jun 2010 20:52:48 +0000 (22:52 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 Aug 2010 20:47:40 +0000 (13:47 -0700)
The lock is no longer needed for wait until sent paths so this can go

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/char/epca.c

index 6f5ffe1320f700f330beabd0481e62b5b9a56f48..d9df46aa0fbafa8988e4d0fda760d18bd6e09b76 100644 (file)
@@ -36,7 +36,7 @@
 #include <linux/ctype.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
-#include <linux/smp_lock.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/uaccess.h>
@@ -2105,7 +2105,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,
                break;
        case DIGI_SETAW:
        case DIGI_SETAF:
-               lock_kernel();
                if (cmd == DIGI_SETAW) {
                        /* Setup an event to indicate when the transmit
                           buffer empties */
@@ -2118,7 +2117,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,
                        if (tty->ldisc->ops->flush_buffer)
                                tty->ldisc->ops->flush_buffer(tty);
                }
-               unlock_kernel();
                /* Fall Thru */
        case DIGI_SETA:
                if (copy_from_user(&ch->digiext, argp, sizeof(digi_t)))