aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2009-04-10 18:47:05 +0000
committerMirko Vogt <mirko@openwrt.org>2009-04-10 18:47:05 +0000
commitae9a275a8e59093bf0c00e11ffda1aa5f3e57a61 (patch)
tree027ba968f5d6db6f23caede11b1478bfd4c49761
parent4e4bda2949b5135b5dcaf671342b4e6711871d86 (diff)
downloadupstream-ae9a275a8e59093bf0c00e11ffda1aa5f3e57a61.tar.gz
upstream-ae9a275a8e59093bf0c00e11ffda1aa5f3e57a61.tar.bz2
upstream-ae9a275a8e59093bf0c00e11ffda1aa5f3e57a61.zip
add the R_ARM_V4BX relocation to the ARM kernel module loader
SVN-Revision: 15208
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch b/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
new file mode 100644
index 0000000000..3fac7aba43
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
@@ -0,0 +1,33 @@
+diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
+index a58378c..ce3b36e 100644
+--- a/arch/arm/include/asm/elf.h
++++ b/arch/arm/include/asm/elf.h
+@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t;
+ #define R_ARM_ABS32 2
+ #define R_ARM_CALL 28
+ #define R_ARM_JUMP24 29
++#define R_ARM_V4BX 40
+
+ /*
+ * These are used to set parameters in the core dumps.
+diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
+index dab48f2..9f509fd 100644
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -132,6 +132,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;
++
+ default:
+ printk(KERN_ERR "%s: unknown relocation: %u\n",
+ module->name, ELF32_R_TYPE(rel->r_info));
+