linux-mips
[Top] [All Lists]

[PATCH] Fix vgacon oops on 64-bit

To: linux-mips@linux-mips.org
Subject: [PATCH] Fix vgacon oops on 64-bit
From: Matt Porter <mporter@kernel.crashing.org>
Date: Mon, 30 Jan 2006 08:33:21 -0700
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.2.5i
Although I'm not running a VGA card, I noticed this building
a working malta 32-bit defconfig (vgacon enabled) for 64-bit.
Without it, the vgacon probe will access unmapped space when
looking to see if a vga card is present.

Signed-off-by: Matt Porter <mporter@kernel.crashing.org>

diff --git a/include/asm-mips/vga.h b/include/asm-mips/vga.h
index ca5cec9..1390ab6 100644
--- a/include/asm-mips/vga.h
+++ b/include/asm-mips/vga.h
@@ -13,7 +13,11 @@
  *     access the videoram directly without any black magic.
  */
 
+#ifdef CONFIG_64BIT
+#define VGA_MAP_MEM(x) (0xffffffffb0000000UL + (unsigned long)(x))
+#else
 #define VGA_MAP_MEM(x) (0xb0000000L + (unsigned long)(x))
+#endif
 
 #define vga_readb(x)   (*(x))
 #define vga_writeb(x,y)        (*(y) = (x))

<Prev in Thread] Current Thread [Next in Thread>