summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-27 21:28:02 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-27 21:28:02 +0000
commitb281497b69f2ecc02747c8e5d9cdd2b19cf95429 (patch)
tree180b2c74131eb4d4bd7c855e1de0ca28bda8127c /target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
parent259f6426607dfd76f98eb9ffa44cb88554ffeffc (diff)
switch ixp4xx and ubicom32 to 2.6.30, get rid of 2.6.28 files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18952 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch28
1 files changed, 0 insertions, 28 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
deleted file mode 100644
index 3e8d1fb0b..000000000
--- a/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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.
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -136,6 +136,15 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- *(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));