diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2006-06-22 14:47:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 15:05:58 -0700 |
| commit | 4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4 (patch) | |
| tree | 883c6ece20a28f86eb73cd329bb9d4674b1e5480 /drivers/video/vga16fb.c | |
| parent | d702ccb342e49f7591df5a87c3857c698183b0fa (diff) | |
| download | linux-4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4.tar.gz linux-4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4.tar.bz2 linux-4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4.zip | |
[PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use
VGA_MAP_MEM translates to ioremap() on some architectures. It makes sense
to do this to vga_vram_base, because we're going to access memory between
vga_vram_base and vga_vram_end.
But it doesn't really make sense to map starting at vga_vram_end, because
we aren't going to access memory starting there. On ia64, which always has
to be different, ioremapping vga_vram_end gives you something completely
incompatible with ioremapped vga_vram_start, so vga_vram_size ends up being
nonsense.
As a bonus, we often know the size up front, so we can use ioremap()
correctly, rather than giving it a zero size.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/vga16fb.c')
| -rw-r--r-- | drivers/video/vga16fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c index f3f16fd9f231..4fd2a272e03d 100644 --- a/drivers/video/vga16fb.c +++ b/drivers/video/vga16fb.c @@ -1351,7 +1351,7 @@ static int __init vga16fb_probe(struct device *device) } /* XXX share VGA_FB_PHYS and I/O region with vgacon and others */ - info->screen_base = (void __iomem *)VGA_MAP_MEM(VGA_FB_PHYS); + info->screen_base = (void __iomem *)VGA_MAP_MEM(VGA_FB_PHYS, 0); if (!info->screen_base) { printk(KERN_ERR "vga16fb: unable to map device\n"); |