openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
David Gibson 2005-10-13 15:46:22 +10:00 committed by Paul Mackerras
parent 61f684ec07
commit 55d363397f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/prom_init.c
View File

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