Selaa lähdekoodia

epca: Kill the big kernel lock

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>
Alan Cox 15 vuotta sitten
vanhempi
commit
7cc34fd028
1 muutettua tiedostoa jossa 1 lisäystä ja 3 poistoa
  1. 1 3
      drivers/char/epca.c

+ 1 - 3
drivers/char/epca.c

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