aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-07-14 10:31:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 16:00:41 -0400
commitadc8d746caa67fff4b53ba3e5163a6cbacc3b523 (patch)
treee3f6c05f27c163b369ddd4da5f31d2a61bde6d3a /drivers/tty/vt
parent6d31a88cb2e01d46c0cb74aa5da529e1f92ae3db (diff)
tty: move the termios object into the tty
This will let us sort out a whole pile of tty related races. The alternative would be to keep points and refcount the termios objects. However 1. They are tiny anyway 2. Many devices don't use the stored copies 3. We can remove a pty special case Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r--drivers/tty/vt/vt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 7cb53c236339..dbceaeb2c3eb 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2823,9 +2823,9 @@ static int con_install(struct tty_driver *driver, struct tty_struct *tty)
2823 tty->winsize.ws_col = vc_cons[currcons].d->vc_cols; 2823 tty->winsize.ws_col = vc_cons[currcons].d->vc_cols;
2824 } 2824 }
2825 if (vc->vc_utf) 2825 if (vc->vc_utf)
2826 tty->termios->c_iflag |= IUTF8; 2826 tty->termios.c_iflag |= IUTF8;
2827 else 2827 else
2828 tty->termios->c_iflag &= ~IUTF8; 2828 tty->termios.c_iflag &= ~IUTF8;
2829unlock: 2829unlock:
2830 console_unlock(); 2830 console_unlock();
2831 return ret; 2831 return ret;