diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-05-15 16:30:12 -0400 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-05-15 16:30:12 -0400 |
| commit | e1c70ae9fad254c3de4af043ebe935ac580f2182 (patch) | |
| tree | a228e010b509eb5481e3a04ac9b676655395daa9 /drivers/char | |
| parent | a1fcb5b7b424e9fb57c2b8448f70ee20a961ad4b (diff) | |
| parent | a82a9bfebc74862798a3f6949fe6f6a959c1fd4e (diff) | |
| download | lwn-e1c70ae9fad254c3de4af043ebe935ac580f2182.tar.gz lwn-e1c70ae9fad254c3de4af043ebe935ac580f2182.zip | |
Merge branch '2.6.25.y' into testing
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/vt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 9b58b894f823..c2e1a8352f51 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -2723,6 +2723,10 @@ static int con_open(struct tty_struct *tty, struct file *filp) tty->winsize.ws_row = vc_cons[currcons].d->vc_rows; tty->winsize.ws_col = vc_cons[currcons].d->vc_cols; } + if (vc->vc_utf) + tty->termios->c_iflag |= IUTF8; + else + tty->termios->c_iflag &= ~IUTF8; release_console_sem(); vcs_make_sysfs(tty); return ret; @@ -2899,6 +2903,8 @@ int __init vty_init(void) console_driver->minor_start = 1; console_driver->type = TTY_DRIVER_TYPE_CONSOLE; console_driver->init_termios = tty_std_termios; + if (default_utf8) + console_driver->init_termios.c_iflag |= IUTF8; console_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS; tty_set_operations(console_driver, &con_ops); if (tty_register_driver(console_driver)) |