diff options
| author |   David Gibson <david@gibson.dropbear.id.au> | 2005-10-13 15:46:22 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2005-10-17 21:43:12 +1000 |
| commit | 55d363397f1bdfa4fe861f0e2fadb058c79dafea (patch) | |
| tree | e09d805e36f1a024bd999c8f3b4bc620608ece4b /arch | |
| parent | [PATCH] powerpc: Fix use of LOADBASE in merge tree (diff) | |
| download | linux-dev-55d363397f1bdfa4fe861f0e2fadb058c79dafea.tar.xz linux-dev-55d363397f1bdfa4fe861f0e2fadb058c79dafea.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index d9130c839039..9b1baaa9eda0 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -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 |