Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57ac895a authored by Davide Brini's avatar Davide Brini Committed by Linus Torvalds
Browse files

uml: fix umid in xterm titles 



Calls lines_init() *after* xterm_title is modified to include umid.

Signed-off-by: default avatarDavide Brini <davide.brini@unibo.it>
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Acked-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c74c69b4

arch/um/drivers/ssl.c

+2 −2
Original line number Diff line number Diff line
@@ -191,12 +191,12 @@ static int ssl_init(void) 
	ssl_driver = register_lines(&driver, &ssl_ops, serial_lines,

				    ARRAY_SIZE(serial_lines));



	lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts);



	new_title = add_xterm_umid(opts.xterm_title);

	if (new_title != NULL)

		opts.xterm_title = new_title;



	lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts);



	ssl_init_done = 1;

	register_console(&ssl_cons);

	return 0;

arch/um/drivers/stdio_console.c

+2 −2
Original line number Diff line number Diff line
@@ -166,12 +166,12 @@ int stdio_init(void) 
		return -1;

	printk(KERN_INFO "Initialized stdio console driver\n");



	lines_init(vts, ARRAY_SIZE(vts), &opts);



	new_title = add_xterm_umid(opts.xterm_title);

	if(new_title != NULL)

		opts.xterm_title = new_title;



	lines_init(vts, ARRAY_SIZE(vts), &opts);



	con_init_done = 1;

	register_console(&stdiocons);

	return 0;