[PATCH] uml: move console configuration
This patch changes when console devices are configured in order to prepare the ground for the next patch. parse_chan_pair is now done earlier, when initcalls are run, rather than when the device is opened. When a host device disappears, the channel list is closed, but not freed. This is required by the previous change. line_config now takes the options structure as an argument, and line_open doesn't. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
418e55d49b
commit
1f80171e81
@@ -91,7 +91,7 @@ struct line vts[MAX_TTYS] = { LINE_INIT(CONFIG_CON_ZERO_CHAN, &driver),
|
||||
|
||||
static int con_config(char *str)
|
||||
{
|
||||
return line_config(vts, ARRAY_SIZE(vts), str);
|
||||
return line_config(vts, ARRAY_SIZE(vts), str, &opts);
|
||||
}
|
||||
|
||||
static int con_get_config(char *dev, char *str, int size, char **error_out)
|
||||
@@ -106,7 +106,7 @@ static int con_remove(int n)
|
||||
|
||||
static int con_open(struct tty_struct *tty, struct file *filp)
|
||||
{
|
||||
return line_open(vts, tty, &opts);
|
||||
return line_open(vts, tty);
|
||||
}
|
||||
|
||||
static int con_init_done = 0;
|
||||
@@ -169,7 +169,7 @@ int stdio_init(void)
|
||||
return -1;
|
||||
printk(KERN_INFO "Initialized stdio console driver\n");
|
||||
|
||||
lines_init(vts, ARRAY_SIZE(vts));
|
||||
lines_init(vts, ARRAY_SIZE(vts), &opts);
|
||||
|
||||
new_title = add_xterm_umid(opts.xterm_title);
|
||||
if(new_title != NULL)
|
||||
|
Reference in New Issue
Block a user