Commit 55d36339 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Another maple merge tree fix 



With ARCH=powerpc, a spurious ifdef in prom_init prevented the
seconday hold loop being correctly copied down on Maple.  With this
patch, Maple boots with ARCH=powerpc

Signed-off-by: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 61f684ec

arch/powerpc/kernel/prom_init.c

+1 −3
Original line number Diff line number Diff line
@@ -1955,13 +1955,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, 
		prom_send_capabilities();

#endif



#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_BPA)

	/*

	 * On pSeries and BPA, copy the CPU hold code

	 */

       	if (RELOC(of_platform) & (PLATFORM_PSERIES | PLATFORM_BPA))

       	if (RELOC(of_platform) != PLATFORM_POWERMAC)

       		copy_and_flush(0, KERNELBASE + offset, 0x100, 0);

#endif



	/*

	 * Do early parsing of command line