Skip to contentSkip to conversation

stallion: Prepare for BKL push down

PATCH New Alan Cox 1 participant 1 message Feb 20, 2008 Char and misc drivers

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 stallion: Prepare for BKL push down

Remove broken softcar functions, wrap ioctl handler in BKL

drivers/char/stallion.c +3 -12
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc2-mm1/drivers/char/stallion.c linux-2.6.25-rc2-mm1/drivers/char/stallion.c
@@ -1273,18 +1273,9 @@
 
 	rc = 0;
 
+	lock_kernel();
+	
 	switch (cmd) {
-	case TIOCGSOFTCAR:
-		rc = put_user(((tty->termios->c_cflag & CLOCAL) ? 1 : 0),
-			(unsigned __user *) argp);
-		break;
-	case TIOCSSOFTCAR:
-		if (get_user(ival, (unsigned int __user *) arg))
-			return -EFAULT;
-		tty->termios->c_cflag =
-				(tty->termios->c_cflag & ~CLOCAL) |
-				(ival ? CLOCAL : 0);
-		break;
 	case TIOCGSERIAL:
 		rc = stl_getserial(portp, argp);
 		break;
@@ -1308,7 +1299,7 @@
 		rc = -ENOIOCTLCMD;
 		break;
 	}
-
+	unlock_kernel();
 	return rc;
 }