diff options
author | Alan Cox <alan@linux.intel.com> | 2010-06-01 16:52:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 16:47:40 -0400 |
commit | 7cc34fd028ef35b12fec0fa9268c37c099d33bd2 (patch) | |
tree | d31500ec5bd0e241ab8ba3caf83e9894cd367a88 | |
parent | 25c3cdf80c73156e910a322aba468ddaca0b91ae (diff) |
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>
-rw-r--r-- | drivers/char/epca.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index 6f5ffe1320f..d9df46aa0fb 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <linux/ctype.h> | 36 | #include <linux/ctype.h> |
37 | #include <linux/tty.h> | 37 | #include <linux/tty.h> |
38 | #include <linux/tty_flip.h> | 38 | #include <linux/tty_flip.h> |
39 | #include <linux/smp_lock.h> | 39 | #include <linux/slab.h> |
40 | #include <linux/ioport.h> | 40 | #include <linux/ioport.h> |
41 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
42 | #include <linux/uaccess.h> | 42 | #include <linux/uaccess.h> |
@@ -2105,7 +2105,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file, | |||
2105 | break; | 2105 | break; |
2106 | case DIGI_SETAW: | 2106 | case DIGI_SETAW: |
2107 | case DIGI_SETAF: | 2107 | case DIGI_SETAF: |
2108 | lock_kernel(); | ||
2109 | if (cmd == DIGI_SETAW) { | 2108 | if (cmd == DIGI_SETAW) { |
2110 | /* Setup an event to indicate when the transmit | 2109 | /* Setup an event to indicate when the transmit |
2111 | buffer empties */ | 2110 | buffer empties */ |
@@ -2118,7 +2117,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file, | |||
2118 | if (tty->ldisc->ops->flush_buffer) | 2117 | if (tty->ldisc->ops->flush_buffer) |
2119 | tty->ldisc->ops->flush_buffer(tty); | 2118 | tty->ldisc->ops->flush_buffer(tty); |
2120 | } | 2119 | } |
2121 | unlock_kernel(); | ||
2122 | /* Fall Thru */ | 2120 | /* Fall Thru */ |
2123 | case DIGI_SETA: | 2121 | case DIGI_SETA: |
2124 | if (copy_from_user(&ch->digiext, argp, sizeof(digi_t))) | 2122 | if (copy_from_user(&ch->digiext, argp, sizeof(digi_t))) |