From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/video/cfbimgblt.c | 4 ++-- include/linux/fb.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/video/cfbimgblt.c~revert-fbcon-rere-fix-little-endian-bogosity-in-slow_imageblit drivers/video/cfbimgblt.c --- a/drivers/video/cfbimgblt.c~revert-fbcon-rere-fix-little-endian-bogosity-in-slow_imageblit +++ a/drivers/video/cfbimgblt.c @@ -168,7 +168,7 @@ static inline void slow_imageblit(const while (j--) { l--; - color = (*s & (1 << FB_BIT_NR(l))) ? fgcolor : bgcolor; + color = (*s & (1 << l)) ? fgcolor : bgcolor; val |= FB_SHIFT_HIGH(color, shift); /* Did the bitshift spill bits to the next long? */ @@ -258,7 +258,7 @@ static inline void fast_imageblit(const s += spitch; } } - + void cfb_imageblit(struct fb_info *p, const struct fb_image *image) { u32 fgcolor, bgcolor, start_index, bitstart, pitch_index = 0; diff -puN include/linux/fb.h~revert-fbcon-rere-fix-little-endian-bogosity-in-slow_imageblit include/linux/fb.h --- a/include/linux/fb.h~revert-fbcon-rere-fix-little-endian-bogosity-in-slow_imageblit +++ a/include/linux/fb.h @@ -854,12 +854,10 @@ struct fb_info { #endif #if defined (__BIG_ENDIAN) -#define FB_BIT_NR(b) (b) #define FB_LEFT_POS(bpp) (32 - bpp) #define FB_SHIFT_HIGH(val, bits) ((val) >> (bits)) #define FB_SHIFT_LOW(val, bits) ((val) << (bits)) #else -#define FB_BIT_NR(b) (7 - (b)) #define FB_LEFT_POS(bpp) (0) #define FB_SHIFT_HIGH(val, bits) ((val) << (bits)) #define FB_SHIFT_LOW(val, bits) ((val) >> (bits)) _