Skip to content

Commit

Permalink
ARM: 6190/1: Remove dummy loads from the original relocation address
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Catalin Marinas authored and Russell King committed Aug 5, 2010
1 parent 8dd4774 commit 0567821
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/arm/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 0567821

Please sign in to comment.