[PATCH 6/6] tty/vt: add some KERN_CONT markers to continuation lines

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?=
Date: Wednesday, November 24, 2010 - 1:57 am

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/tty/vt/vt.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index a8ec48e..e4b05ad 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2930,11 +2930,11 @@ static int __init con_init(void)
 	gotoxy(vc, vc->vc_x, vc->vc_y);
 	csi_J(vc, 0);
 	update_screen(vc);
-	printk("Console: %s %s %dx%d",
+	printk(KERN_DEFAULT "Console: %s %s %dx%d",
 		vc->vc_can_do_color ? "colour" : "mono",
 		display_desc, vc->vc_cols, vc->vc_rows);
 	printable = 1;
-	printk("\n");
+	printk(KERN_CONT "\n");
 
 	release_console_sem();
 
@@ -3084,11 +3084,11 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
 
 	printk("Console: switching ");
 	if (!deflt)
-		printk("consoles %d-%d ", first+1, last+1);
+		printk(KERN_CONT "consoles %d-%d ", first+1, last+1);
 	if (j >= 0) {
 		struct vc_data *vc = vc_cons[j].d;
 
-		printk("to %s %s %dx%d\n",
+		printk(KERN_CONT "to %s %s %dx%d\n",
 		       vc->vc_can_do_color ? "colour" : "mono",
 		       desc, vc->vc_cols, vc->vc_rows);
 
@@ -3097,7 +3097,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
 			update_screen(vc);
 		}
 	} else
-		printk("to %s\n", desc);
+		printk(KERN_CONT "to %s\n", desc);
 
 	retval = 0;
 err:
-- 
1.7.2.3

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] ARM: allow, but warn, when issuing ioremap() on RAM, Felipe Contreras, (Thu Oct 7, 2:44 am)
Re: [PATCH v2] ARM: allow, but warn, when issuing ioremap( ..., Uwe Kleine-König, (Thu Oct 7, 11:00 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Thu Oct 7, 12:22 pm)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Fri Oct 8, 10:53 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Fri Oct 8, 4:04 pm)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Fri Oct 8, 4:44 pm)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Fri Oct 8, 5:10 pm)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Fri Oct 8, 5:25 pm)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Sat Oct 9, 1:56 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Sat Oct 9, 2:21 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Sat Oct 9, 5:05 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Sat Oct 9, 6:52 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Sat Oct 9, 7:37 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Sat Oct 9, 9:45 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Guennadi Liakhovetski, (Sat Oct 9, 11:59 am)
RE: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Pedanekar, Hemant, (Sun Oct 10, 7:23 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Uwe Kleine-König, (Mon Oct 11, 1:35 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Mon Oct 11, 2:02 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Uwe Kleine-König, (Mon Oct 11, 2:24 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Mon Oct 11, 3:15 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Mon Oct 11, 3:52 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Mon Oct 11, 8:25 am)
RE: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Woodruff, Richard, (Wed Oct 13, 9:17 am)
RE: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Woodruff, Richard, (Thu Oct 14, 8:29 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Felipe Contreras, (Thu Oct 14, 10:44 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Benjamin Herrenschmidt, (Fri Oct 15, 7:36 pm)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Benjamin Herrenschmidt, (Fri Oct 15, 7:39 pm)
RE: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Woodruff, Richard, (Sun Oct 17, 6:05 am)
RE: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Benjamin Herrenschmidt, (Sun Oct 17, 4:17 pm)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Tue Oct 19, 11:12 am)
Re: [PATCH] ARM: allow, but warn, when issuing ioremap() o ..., Russell King - ARM Linux, (Tue Oct 19, 12:21 pm)
Re: About multi-line printk and the need (not) to repeat l ..., Uwe Kleine-König, (Tue Nov 23, 3:39 am)
Re: About multi-line printk and the need (not) to repeat l ..., Uwe Kleine-König, (Tue Nov 23, 3:58 am)
Re: About multi-line printk and the need (not) to repeat l ..., Russell King - ARM Linux, (Tue Nov 23, 3:33 pm)
Re: About multi-line printk and the need (not) to repeat l ..., Uwe Kleine-König, (Wed Nov 24, 1:17 am)
[PATCH 0/6] add some KERN_CONT markers to continuation lines, Uwe Kleine-König, (Wed Nov 24, 1:56 am)
[PATCH 1/6] ARM: add some KERN_CONT markers to continuatio ..., =?UTF-8?q?Uwe=20Klei ..., (Wed Nov 24, 1:57 am)
[PATCH 2/6] block: add some KERN_CONT markers to continuat ..., =?UTF-8?q?Uwe=20Klei ..., (Wed Nov 24, 1:57 am)
[PATCH 3/6] net: add some KERN_CONT markers to continuatio ..., =?UTF-8?q?Uwe=20Klei ..., (Wed Nov 24, 1:57 am)
[PATCH 4/6] init: add some KERN_CONT markers to continuati ..., =?UTF-8?q?Uwe=20Klei ..., (Wed Nov 24, 1:57 am)
[PATCH 5/6] mm: add some KERN_CONT markers to continuation ..., =?UTF-8?q?Uwe=20Klei ..., (Wed Nov 24, 1:57 am)
[PATCH 6/6] tty/vt: add some KERN_CONT markers to continua ..., =?UTF-8?q?Uwe=20Klei ..., (Wed Nov 24, 1:57 am)
Re: About multi-line printk and the need (not) to repeat l ..., Michał Mirosław, (Wed Nov 24, 2:09 am)