mirror of https://gitee.com/openkylin/linux.git
stallion: Prepare for BKL push down
Remove broken softcar functions, wrap ioctl handler in BKL Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b190e178f6
commit
f433c65b8a
|
@ -1273,18 +1273,9 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd
|
|||
|
||||
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 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd
|
|||
rc = -ENOIOCTLCMD;
|
||||
break;
|
||||
}
|
||||
|
||||
unlock_kernel();
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue