projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8dd4774)
ARM: 6190/1: Remove dummy loads from the original relocation address
authorCatalin Marinas <catalin.marinas@arm.com>
Mon, 21 Jun 2010 14:11:08 +0000 (15:11 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Aug 2010 09:35:47 +0000 (10:35 +0100)
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>
arch/arm/kernel/module.c patch | blob | blame | history

diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index ae3c80453a0930035bb29d0d0acf4ff20f34df0e..aab7fcaba07005025a0f9f061aaac100e310b507 100644 (file)
--- 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: