From 19cfeb30bdec11b289970e8b6056c741e0c36a34 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 1 Jun 2010 22:52:48 +0200
Subject: [PATCH] --- yaml --- r: 207892 b: refs/heads/master c:
 7cc34fd028ef35b12fec0fa9268c37c099d33bd2 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/epca.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4e0761aa6c4b..a537edcbef05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25c3cdf80c73156e910a322aba468ddaca0b91ae
+refs/heads/master: 7cc34fd028ef35b12fec0fa9268c37c099d33bd2
diff --git a/trunk/drivers/char/epca.c b/trunk/drivers/char/epca.c
index 6f5ffe1320f7..d9df46aa0fba 100644
--- a/trunk/drivers/char/epca.c
+++ b/trunk/drivers/char/epca.c
@@ -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)))