Commit ded1bc69 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] vga16fb.c: fix bogus mem_start value

From: Herbert Xu <herbert@gondor.apana.org.au>

The recent change to vga16fb's memory mapping that you partially reverted
is still broken.  In particular, it's setting fix.mem_start to a virtual
address on i386.  The value of fix.mem_start is meant to be physical.

We could simply apply virt_to_phys to it, but somehow I doubt that is what
it's meant to do on arm.  So until we hear from someone who knows how it
works on arm, let's just revert this change.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 004a2b36
...@@ -1372,8 +1372,6 @@ int __init vga16fb_init(void) ...@@ -1372,8 +1372,6 @@ int __init vga16fb_init(void)
vga16fb.par = &vga16_par; vga16fb.par = &vga16_par;
vga16fb.flags = FBINFO_FLAG_DEFAULT; vga16fb.flags = FBINFO_FLAG_DEFAULT;
vga16fb.fix.smem_start = VGA_MAP_MEM(vga16fb.fix.smem_start);
i = (vga16fb_defined.bits_per_pixel == 8) ? 256 : 16; i = (vga16fb_defined.bits_per_pixel == 8) ? 256 : 16;
ret = fb_alloc_cmap(&vga16fb.cmap, i, 0); ret = fb_alloc_cmap(&vga16fb.cmap, i, 0);
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment