[PATCH] powerpc: Remove unused vgacon_remap_base & fix build break

Michael Ellerman mpe at ellerman.id.au
Mon Oct 27 20:56:14 AEDT 2014

The build is broken with CONFIG_PPC32=y, CONFIG_FB_VGA16=y and

The problem is that vgacon_remap_base is not defined. It's used in:

    #define VGA_MAP_MEM(x,s) (x + vgacon_remap_base)

Which is used in the vga16fb.c code.

Digging down it seems vgacon_remap_base is never initialised. It used to
be, back in arch/ppc (pplus.c and prep_setup.c), but none of that code
ever made it to arch/powerpc.

So given it's been unused for >6 years, remove it.

Whether vga16fb.c works on 32-bit is another question, but this patch
shouldn't affect it.

Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
 arch/powerpc/include/asm/vga.h | 4 +---
 arch/powerpc/kernel/setup_32.c | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/powerpc/include/asm/vga.h b/arch/powerpc/include/asm/vga.h
index a2eac409c1ec..e5f8dd366212 100644
--- a/arch/powerpc/include/asm/vga.h
+++ b/arch/powerpc/include/asm/vga.h
@@ -38,12 +38,10 @@ static inline u16 scr_readw(volatile const u16 *addr)
-extern unsigned long vgacon_remap_base;
 #ifdef __powerpc64__
 #define VGA_MAP_MEM(x,s) ((unsigned long) ioremap((x), s))
-#define VGA_MAP_MEM(x,s) (x + vgacon_remap_base)
+#define VGA_MAP_MEM(x,s) (x)
 #define vga_readb(x) (*(x))
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 07831ed0d9ef..e46b56657c53 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -53,11 +53,6 @@ unsigned long ISA_DMA_THRESHOLD;
 unsigned int DMA_MODE_READ;
 unsigned int DMA_MODE_WRITE;
-unsigned long vgacon_remap_base;
  * These are used in binfmt_elf.c to put aux entries on the stack
  * for each elf executable being started.

More information about the Linuxppc-dev mailing list