Messages in this thread Patch in this message | | | Date | Wed, 20 Feb 2008 20:27:57 +0000 | From | Alan Cox <> | Subject | [PATCH] stallion: Prepare for BKL push down |
| |
Remove broken softcar functions, wrap ioctl handler in BKL
Signed-off-by: Alan Cox <alan@redhat.com>
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 --- linux.vanilla-2.6.25-rc2-mm1/drivers/char/stallion.c 2008-02-19 11:03:00.000000000 +0000 +++ linux-2.6.25-rc2-mm1/drivers/char/stallion.c 2008-02-20 11:49:03.000000000 +0000 @@ -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; }
| |