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 /include/asm-powerpc/vga.h | |
parent | d702ccb342e49f7591df5a87c3857c698183b0fa (diff) | |
download | kernel_samsung_smdk4412-4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4.zip kernel_samsung_smdk4412-4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4.tar.gz kernel_samsung_smdk4412-4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4.tar.bz2 |
[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 'include/asm-powerpc/vga.h')
-rw-r--r-- | include/asm-powerpc/vga.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/vga.h b/include/asm-powerpc/vga.h index eadaf2f..a2eac40 100644 --- a/include/asm-powerpc/vga.h +++ b/include/asm-powerpc/vga.h @@ -41,9 +41,9 @@ static inline u16 scr_readw(volatile const u16 *addr) extern unsigned long vgacon_remap_base; #ifdef __powerpc64__ -#define VGA_MAP_MEM(x) ((unsigned long) ioremap((x), 0)) +#define VGA_MAP_MEM(x,s) ((unsigned long) ioremap((x), s)) #else -#define VGA_MAP_MEM(x) (x + vgacon_remap_base) +#define VGA_MAP_MEM(x,s) (x + vgacon_remap_base) #endif #define vga_readb(x) (*(x)) |