[PATCH] Fix vgacon oops on 64-bit

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxxxxxx>

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))


[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux