Re: fbcon sleeping function call from illegal context

[Thomas Schlichter <schlicht@uni-mannheim.de>]

[-- Attachment #1.1: body text --]
[-- Type: text/plain, Size: 851 bytes --]

Am Mittwoch, 26. März 2003 15:31 schrieb Thomas Molina:
> One hunk applied with fuzz and two hunks were rejected when applied both 
> to 2.5.66 stock and bk-latest.  I fixed up the rejects by hand and 
> compiled a new kernel against bk-latest.  I am running with that version 
> now, which doesn't emit the string of messages I reported originally.  The 
> only minor anomaly I note is the cursor is a three-segment underscore 
> rather than a solid underscore.  

I had the same problems patching my 2.5.66 and so applied the patch by hand, 
too. The problem with the wrong shaped cursor was here, too, I solved it with 
the attached patch. The 'data' area was not initialized correctly. The patch 
also uses 'memset()' to generate the 'mask' instead of writing the bytes by 
hand...

I hope this helps you,too!

   Thomas Schlichter

[-- Attachment #1.2: fbcon.patch --]
[-- Type: text/x-diff, Size: 1573 bytes --]

--- linux-2.5.66/drivers/video/console/fbcon.c.patched	Wed Mar 26 15:16:41 2003
+++ linux-2.5.66/drivers/video/console/fbcon.c	Wed Mar 26 15:27:15 2003
@@ -1001,7 +1001,7 @@
 	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
 	int fgshift = (vc->vc_hi_font_mask) ? 9 : 8;
 	int height, width, size, c;
-	int w, cur_height, i = 0;
+	int w, cur_height;
 	char *font, *mask, *data;
 	
 	if (cursor->set & FB_CUR_SETCUR)
@@ -1021,7 +1021,8 @@
 		cursor->set |= FB_CUR_SETSIZE;
 	}	
 
-	size = ((width + 7) >> 3) * height;
+	w = (width + 7) >> 3;
+	size = w * height;
 
 	data = kmalloc(size, GFP_KERNEL);
 
@@ -1034,10 +1035,7 @@
 		return;
 	}
 
-	if (cursor->set & FB_CUR_SETSIZE) {
-		memset(data, 0xff, size);
-		cursor->set |= FB_CUR_SETSHAPE;
-	}
+	memset(data, 0xff, size);
 
 	c = scr_readw((u16 *) vc->vc_pos);
 
@@ -1053,8 +1051,6 @@
 		cursor->set |= FB_CUR_SETDEST;
 	}
 
-	w = (width + 7) >> 3;
-
 	switch (vc->vc_cursor_type & 0x0f) {
 		case CUR_NONE:
 			cur_height = 0;
@@ -1078,13 +1074,15 @@
 	}
 
 	size = (height - cur_height) * w;
-	while (size--)
-		mask[i++] = 0;
-	size = cur_height * w;
-	while (size--)
-		mask[i++] = 0xff;
 
-	if (!info->cursor.mask ||  (memcmp(mask, info->cursor.mask, w*height)))
+	if (size)
+		memset(mask, 0x00, size);
+
+	if (cur_height)
+		memset(mask + size, 0xff, cur_height * w);
+
+	if ((cursor->set & FB_CUR_SETSIZE) || !info->cursor.mask ||
+	    memcmp(mask, info->cursor.mask, w*height))
 		cursor->set |= FB_CUR_SETSHAPE;
 
 	cursor->image.width = width;

[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]