ia64/xen-unstable

changeset 3036:e8a7fc6398af

bitkeeper revision 1.1159.178.3 (419cb8c1UgT4GEBjhcYkdZbYSHPLpw)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
author cl349@arcadians.cl.cam.ac.uk
date Thu Nov 18 14:59:13 2004 +0000 (2004-11-18)
parents c4c8868de7cf 2c98cd276123
children 1f69171df585 adb332644e96
files BitKeeper/etc/logging_ok linux-2.6.9-xen-sparse/drivers/char/tty_io.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Thu Nov 18 10:30:37 2004 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Thu Nov 18 14:59:13 2004 +0000
     1.3 @@ -10,6 +10,7 @@ br260@br260.wolfson.cam.ac.uk
     1.4  br260@labyrinth.cl.cam.ac.uk
     1.5  br260@laudney.cl.cam.ac.uk
     1.6  bren@anvil.research
     1.7 +cl349@arcadians.cl.cam.ac.uk
     1.8  cl349@freefall.cl.cam.ac.uk
     1.9  cl349@labyrinth.cl.cam.ac.uk
    1.10  cwc22@centipede.cl.cam.ac.uk
     2.1 --- a/linux-2.6.9-xen-sparse/drivers/char/tty_io.c	Thu Nov 18 10:30:37 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/drivers/char/tty_io.c	Thu Nov 18 14:59:13 2004 +0000
     2.3 @@ -1741,7 +1741,7 @@ retry_open:
     2.4  		goto got_driver;
     2.5  	}
     2.6  #ifdef CONFIG_VT
     2.7 -	if (console_use_vt && device == MKDEV(TTY_MAJOR,0)) {
     2.8 +	if (device == MKDEV(TTY_MAJOR,0)) {
     2.9  		extern int fg_console;
    2.10  		extern struct tty_driver *console_driver;
    2.11  		driver = console_driver;
    2.12 @@ -1961,7 +1961,7 @@ static int tiocswinsz(struct tty_struct 
    2.13  	if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg)))
    2.14  		return 0;
    2.15  #ifdef CONFIG_VT
    2.16 -	if (console_use_vt && tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) {
    2.17 +	if (tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) {
    2.18  		unsigned int currcons = tty->index;
    2.19  		int rc;
    2.20