diff options
| author | Laurent Dufour <ldufour@linux.vnet.ibm.com> | 2014-01-30 10:58:42 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-02-10 19:24:48 -0500 |
| commit | 3b830c824a8b15bf032eafe09c48a09d2441f16d (patch) | |
| tree | cd5f626faace01a1a270090e766d9bc3ae4d7812 /arch/powerpc | |
| parent | 429d2e8342954d337abe370d957e78291032d867 (diff) | |
powerpc/relocate fix relocate processing in LE mode
Relocation's code is not working in little endian mode because the r_info
field, which is a 64 bits value, should be read from the right offset.
The current code is optimized to read the r_info field as a 32 bits value
starting at the middle of the double word (offset 12). When running in LE
mode, the read value is not correct since only the MSB is read.
This patch removes this optimization which consist to deal with a 32 bits
value instead of a 64 bits one. This way it works in big and little endian
mode.
Signed-off-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/reloc_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/reloc_64.S b/arch/powerpc/kernel/reloc_64.S index b47a0e1ab001..1482327cfeba 100644 --- a/arch/powerpc/kernel/reloc_64.S +++ b/arch/powerpc/kernel/reloc_64.S | |||
| @@ -69,8 +69,8 @@ _GLOBAL(relocate) | |||
| 69 | * R_PPC64_RELATIVE ones. | 69 | * R_PPC64_RELATIVE ones. |
| 70 | */ | 70 | */ |
| 71 | mtctr r8 | 71 | mtctr r8 |
| 72 | 5: lwz r0,12(9) /* ELF64_R_TYPE(reloc->r_info) */ | 72 | 5: ld r0,8(9) /* ELF64_R_TYPE(reloc->r_info) */ |
| 73 | cmpwi r0,R_PPC64_RELATIVE | 73 | cmpdi r0,R_PPC64_RELATIVE |
| 74 | bne 6f | 74 | bne 6f |
| 75 | ld r6,0(r9) /* reloc->r_offset */ | 75 | ld r6,0(r9) /* reloc->r_offset */ |
| 76 | ld r0,16(r9) /* reloc->r_addend */ | 76 | ld r0,16(r9) /* reloc->r_addend */ |