From 0567821cd8aac3f390282e02c9ba633894cbf7c1 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 21 Jun 2010 15:11:08 +0100 Subject: [PATCH] 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 Signed-off-by: Russell King --- arch/arm/kernel/module.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index ae3c804..aab7fca 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, *(u16 *)(loc + 2) = (u16)((lower & 0xd000) | (j1 << 13) | (j2 << 11) | ((offset >> 1) & 0x07ff)); - upper = *(u16 *)loc; - lower = *(u16 *)(loc + 2); break; case R_ARM_THM_MOVW_ABS_NC: -- 2.7.4