Re: 2.6.11-rc2-mm1

[Roman Zippel]

Hi,

On Mon, 24 Jan 2005, Andrew Morton wrote:

> - On my test box there is no flashing cursor on the vga console.  Known bug,
>   please don't report it.
> 
>   Binary searching shows that the bug was introduced by
>   cleanup-vc-array-access.patch but that patch is, unfortunately, huge.

I introduced a stupid typo. The patch below should fix.
After completing rechecking and testing the patch I'll send you a rediffed 
version.

bye, Roman

diff -ur -X /home/devel/roman/nodiff linux-2.6.11-rc2-mm1.org/drivers/char/vt.c linux-2.6.11-rc2-mm1/drivers/char/vt.c
--- linux-2.6.11-rc2-mm1.org/drivers/char/vt.c	2005-01-24 14:16:18.000000000 +0100
+++ linux-2.6.11-rc2-mm1/drivers/char/vt.c	2005-01-24 14:18:25.000000000 +0100
@@ -212,6 +212,8 @@
  *	Low-Level Functions
  */
 
+#define IS_FG(vc)	((vc)->vc_num == fg_console)
+
 #ifdef VT_BUF_VRAM_ONLY
 #define DO_UPDATE(vc)	0
 #else
@@ -544,7 +546,7 @@
 
 static void set_cursor(struct vc_data *vc)
 {
-	if (!vc->vc_num != fg_console || console_blanked ||
+	if (!IS_FG(vc) || console_blanked ||
 	    vc->vc_mode == KD_GRAPHICS)
 		return;
 	if (vc->vc_deccm) {
@@ -1953,7 +1955,7 @@
 	charmask = himask ? 0x1ff : 0xff;
 
 	/* undraw cursor first */
-	if (currcons == fg_console)
+	if (IS_FG(vc))
 		hide_cursor(vc);
 
 	while (!tty->stopped && count) {
@@ -2166,7 +2168,7 @@
 		goto quit;
 
 	/* undraw cursor first */
-	if (vc->vc_num == fg_console)
+	if (IS_FG(vc))
 		hide_cursor(vc);
 
 	start = (ushort *)vc->vc_pos;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/