aboutsummaryrefslogtreecommitdiffstats
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:
authorGabor Juhos <juhosg@openwrt.org>2009-04-24 14:49:08 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-04-24 14:49:08 +0000
commitcb52030f5341d515a153fc4d258646957a3ac75f (patch)
treec18e6a82e1f65e961c086bfd4986effeef6de264 /target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
parent08e832b7f8ec1018b39eb8e8bc7cddc37c461155 (diff)
downloadmaster-187ad058-cb52030f5341d515a153fc4d258646957a3ac75f.tar.gz
master-187ad058-cb52030f5341d515a153fc4d258646957a3ac75f.tar.bz2
master-187ad058-cb52030f5341d515a153fc4d258646957a3ac75f.zip
[kernel] generic/2.6.28: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15389 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.patch9
1 files changed, 2 insertions, 7 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
index 3fac7aba43..f78bba8c94 100644
--- 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
@@ -1,8 +1,6 @@
-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;
+@@ -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
@@ -10,11 +8,9 @@ index a58378c..ce3b36e 100644
/*
* 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,
+@@ -132,6 +132,15 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
*(u32 *)loc |= offset & 0x00ffffff;
break;
@@ -30,4 +26,3 @@ index dab48f2..9f509fd 100644
default:
printk(KERN_ERR "%s: unknown relocation: %u\n",
module->name, ELF32_R_TYPE(rel->r_info));
-