Index: kernel/genarch/src/fb/fb.c
===================================================================
--- kernel/genarch/src/fb/fb.c	(revision 6c0adbc5d1bd5e34f7b20e10c0509330db98bb36)
+++ kernel/genarch/src/fb/fb.c	(revision d3e69353929ddbf51ebfe9f5f9ddabbfceeec750)
@@ -235,9 +235,11 @@
 			unsigned int col;
 			
-			for (col = 0, x = 0; col < cols; col++, x += FONT_WIDTH) {
+			for (col = 0, x = 0; col < cols; col++,
+			    x += FONT_WIDTH) {
 				uint8_t glyph;
 				
 				if (row < rows - 1) {
-					if (backbuf[BB_POS(col, row)] == backbuf[BB_POS(col, row + 1)])
+					if (backbuf[BB_POS(col, row)] ==
+					    backbuf[BB_POS(col, row + 1)])
 						continue;
 					
@@ -247,5 +249,6 @@
 				
 				memcpy(&fb_addr[FB_POS(x, y + yd)],
-				    &glyphs[GLYPH_POS(glyph, yd)], glyphscanline);
+				    &glyphs[GLYPH_POS(glyph, yd)],
+				    glyphscanline);
 			}
 		}
@@ -296,5 +299,6 @@
 		cursor_remove();
 		do {
-			glyph_draw((uint8_t) ' ', position % cols, position / cols);
+			glyph_draw((uint8_t) ' ', position % cols,
+			    position / cols);
 			position++;
 		} while ((position % 8) && (position < cols * rows));
@@ -338,7 +342,11 @@
 			unsigned int x;
 			
-			for (x = 0; x < FONT_WIDTH; x++)
-				rgb_conv(&glyphs[GLYPH_POS(glyph, y) + x * pixelbytes],
-				    (fb_font[ROW2Y(glyph) + y] & (1 << (7 - x))) ? FG_COLOR : BG_COLOR);
+			for (x = 0; x < FONT_WIDTH; x++) {
+				void *dst = &glyphs[GLYPH_POS(glyph, y) +
+				    x * pixelbytes];
+				uint32_t rgb = (fb_font[ROW2Y(glyph) + y] &
+				    (1 << (7 - x))) ? FG_COLOR : BG_COLOR;
+				rgb_conv(dst, rgb);
+			}
 		}
 	}
@@ -365,5 +373,7 @@
 			for (x = 0; x < xres; x++)
 				rgb_conv(&fb_addr[FB_POS(x, y)],
-				    (x < LOGO_WIDTH) ? fb_logo[y * LOGO_WIDTH + x] : LOGO_COLOR);
+				    (x < LOGO_WIDTH) ?
+				    fb_logo[y * LOGO_WIDTH + x] :
+				    LOGO_COLOR);
 		}
 	}
@@ -379,8 +389,11 @@
 			unsigned int col;
 			
-			for (col = 0, x = 0; col < cols; col++, x += FONT_WIDTH)
-				memcpy(&fb_addr[FB_POS(x, y + yd)],
-			    &glyphs[GLYPH_POS(backbuf[BB_POS(col, row)], yd)],
-			    glyphscanline);
+			for (col = 0, x = 0; col < cols;
+			    col++, x += FONT_WIDTH) {
+				void *d = &fb_addr[FB_POS(x, y + yd)];
+				void *s = &glyphs[GLYPH_POS(backbuf[BB_POS(col,
+				    row)], yd)];
+				memcpy(d, s, glyphscanline);
+			}
 		}
 	}