diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2010-06-21 16:11:08 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-05 11:35:47 +0200 |
| commit | 0567821cd8aac3f390282e02c9ba633894cbf7c1 (patch) | |
| tree | 59cc68737313acfab5cab928cfed98faabff1807 /arch/arm/kernel/module.c | |
| parent | ARM: 6189/1: Add support for the MOVW/MOVT relocations in Thumb-2 (diff) | |
| download | linux-0567821cd8aac3f390282e02c9ba633894cbf7c1.tar.xz linux-0567821cd8aac3f390282e02c9ba633894cbf7c1.zip | |
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/module.c')
| -rw-r--r-- | arch/arm/kernel/module.c | 2 |
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, *(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: |