diff options
| author | Davide Brini <davide.brini@unibo.it> | 2007-05-06 23:51:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 21:13:02 +0200 |
| commit | 57ac895a7f22d235f637317f58a2d9ba6ec91a27 (patch) | |
| tree | 241615a77e09f501cc758bf0780052f859237d2a /arch/um | |
| parent | uml: Replace one-element array with zero-element array (diff) | |
| download | linux-57ac895a7f22d235f637317f58a2d9ba6ec91a27.tar.xz linux-57ac895a7f22d235f637317f58a2d9ba6ec91a27.zip | |
uml: fix umid in xterm titles
Calls lines_init() *after* xterm_title is modified to include umid.
Signed-off-by: Davide Brini <davide.brini@unibo.it>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Acked-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/ssl.c | 4 | ||||
| -rw-r--r-- | arch/um/drivers/stdio_console.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index 94faadc5ea1b..fd09ad9e9c0a 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c @@ -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; diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index 90a2c5cc17d4..2bb4193ac1aa 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c @@ -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; |