summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/stdio_console.c
diff options
context:
space:
mode:
authorDavide Brini2007-05-06 23:51:16 +0200
committerLinus Torvalds2007-05-07 21:13:02 +0200
commit57ac895a7f22d235f637317f58a2d9ba6ec91a27 (patch)
tree241615a77e09f501cc758bf0780052f859237d2a /arch/um/drivers/stdio_console.c
parentuml: Replace one-element array with zero-element array (diff)
downloadkernel-qcow2-linux-57ac895a7f22d235f637317f58a2d9ba6ec91a27.tar.gz
kernel-qcow2-linux-57ac895a7f22d235f637317f58a2d9ba6ec91a27.tar.xz
kernel-qcow2-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/drivers/stdio_console.c')
-rw-r--r--arch/um/drivers/stdio_console.c4
1 files changed, 2 insertions, 2 deletions
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;