The patch titled
uml: fix umid in xterm titles
has been added to the -mm tree. Its filename is
uml-fix-umid-in-xterm-titles.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: fix umid in xterm titles
From: Davide Brini <[EMAIL PROTECTED]>
Calls lines_init() *after* xterm_title is modified to include umid.
Signed-off-by: Davide Brini <[EMAIL PROTECTED]>
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
Cc: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/um/drivers/ssl.c | 4 ++--
arch/um/drivers/stdio_console.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff -puN arch/um/drivers/ssl.c~uml-fix-umid-in-xterm-titles
arch/um/drivers/ssl.c
--- a/arch/um/drivers/ssl.c~uml-fix-umid-in-xterm-titles
+++ a/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 -puN arch/um/drivers/stdio_console.c~uml-fix-umid-in-xterm-titles
arch/um/drivers/stdio_console.c
--- a/arch/um/drivers/stdio_console.c~uml-fix-umid-in-xterm-titles
+++ a/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;
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
uml-fix-umid-in-xterm-titles.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
