PPC64 prom logo

[Paul Mackerras]

Geert Uytterhoeven writes:

> Sorry, it seems I missed a RELOC in the PPC64 prom logo code. Is this (patch
> against current BK) OK?

You missed a PTRRELOC in the ppc32 code too:

diff -urN linux-2.5/arch/ppc/syslib/prom_init.c linuxppc-2.5/arch/ppc/syslib/prom_init.c
--- linux-2.5/arch/ppc/syslib/prom_init.c	2003-03-23 16:29:31.000000000 +1100
+++ linuxppc-2.5/arch/ppc/syslib/prom_init.c	2003-03-23 21:38:46.000000000 +1100
@@ -369,7 +369,7 @@
 					break;

 #ifdef CONFIG_LOGO_LINUX_CLUT224
-			clut = logo_linux_clut224.clut;
+			clut = PTRRELOC(logo_linux_clut224.clut);
 			for (i = 0; i < logo_linux_clut224.clutsize;
 			     i++, clut += 3)
 				if (prom_set_color(ih, i + 32, clut[0],

Regards,
Paul.

** Sent via the linuxppc64-dev mail list. See http://lists.linuxppc.org/