summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/module.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-28 21:30:18 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-28 21:30:18 +0100
commit9759d22c8348343b0da4e25d6150c41712686c14 (patch)
tree338b185f11d705258888a8f2318a3a3b7ea0968d /arch/arm/kernel/module.c
parentMerge branch 'origin' into devel (diff)
parent[ARM] 5435/1: fix compile warning in sanity_check_meminfo() (diff)
downloadlinux-9759d22c8348343b0da4e25d6150c41712686c14.tar.xz
linux-9759d22c8348343b0da4e25d6150c41712686c14.zip
Merge branch 'master' into devel
Conflicts: arch/arm/include/asm/elf.h arch/arm/kernel/module.c
Diffstat (limited to 'arch/arm/kernel/module.c')
-rw-r--r--arch/arm/kernel/module.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 13dbd5bf5cc2..d1731e39b496 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -155,6 +155,15 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
*(u32 *)loc |= offset & 0x00ffffff;
break;
+ case R_ARM_V4BX:
+ /* Preserve Rm and the condition code. Alter
+ * other bits to re-code instruction as
+ * MOV PC,Rm.
+ */
+ *(u32 *)loc &= 0xf000000f;
+ *(u32 *)loc |= 0x01a0f000;
+ break;
+
case R_ARM_PREL31:
offset = *(u32 *)loc + sym->st_value - loc;
*(u32 *)loc = offset & 0x7fffffff;