diff options
| author |   Paul Mackerras <paulus@samba.org> | 2005-10-10 22:41:25 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-10 22:41:25 +1000 |
| commit | 5a408329ed19cf2a80e831d28cbd93d2e36155a6 (patch) | |
| tree | dc5ae749f1da14819ef6947893b0c4f2d9e1ed1c /arch/powerpc/kernel/prom_init.c | |
| parent | powerpc: Reduce the 32/64-bit diffs in vmlinux.lds.S (diff) | |
| download | linux-dev-5a408329ed19cf2a80e831d28cbd93d2e36155a6.tar.xz linux-dev-5a408329ed19cf2a80e831d28cbd93d2e36155a6.zip | |
powerpc: Fix bug caused by negation of 64-bit reloc_offset value
Although both ppc32 and ppc64 have a reloc_offset function, the ppc64
one produced the opposite sign to the ppc32 one. This standardizes
on the ppc32 sign and fixes the merged 64-bit code to account for that.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 75b487f107c3..75dc7f3714bd 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -2019,7 +2019,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, * On pSeries and BPA, copy the CPU hold code */ if (RELOC(of_platform) & (PLATFORM_PSERIES | PLATFORM_BPA)) - copy_and_flush(0, KERNELBASE - offset, 0x100, 0); + copy_and_flush(0, KERNELBASE + offset, 0x100, 0); #endif /* |