aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2010-06-21 10:11:08 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-05 05:35:47 -0400
commit0567821cd8aac3f390282e02c9ba633894cbf7c1 (patch)
tree59cc68737313acfab5cab928cfed98faabff1807 /arch/arm/kernel
parent8dd47741d191400c46173ed9fba9d14b4033ce23 (diff)
ARM: 6190/1: Remove dummy loads from the original relocation address
Reading back the upper and lower values in the R_ARM_THM_CALL and R_ARM_THM_JUMP24 case was introduced by a previous commit but they are not needed. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/module.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index ae3c80453a09..aab7fcaba070 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -233,8 +233,6 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
233 *(u16 *)(loc + 2) = (u16)((lower & 0xd000) | 233 *(u16 *)(loc + 2) = (u16)((lower & 0xd000) |
234 (j1 << 13) | (j2 << 11) | 234 (j1 << 13) | (j2 << 11) |
235 ((offset >> 1) & 0x07ff)); 235 ((offset >> 1) & 0x07ff));
236 upper = *(u16 *)loc;
237 lower = *(u16 *)(loc + 2);
238 break; 236 break;
239 237
240 case R_ARM_THM_MOVW_ABS_NC: 238 case R_ARM_THM_MOVW_ABS_NC: