diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:30:18 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:30:18 -0400 |
| commit | 9759d22c8348343b0da4e25d6150c41712686c14 (patch) | |
| tree | 338b185f11d705258888a8f2318a3a3b7ea0968d /arch/arm/kernel | |
| parent | ed40d0c472b136682b2fcba05f89762859c7374f (diff) | |
| parent | f0bba9f934517533acbda7329be93f55d5a01c03 (diff) | |
Merge branch 'master' into devel
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/module.c | 9 |
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, | |||
| 155 | *(u32 *)loc |= offset & 0x00ffffff; | 155 | *(u32 *)loc |= offset & 0x00ffffff; |
| 156 | break; | 156 | break; |
| 157 | 157 | ||
| 158 | case R_ARM_V4BX: | ||
| 159 | /* Preserve Rm and the condition code. Alter | ||
| 160 | * other bits to re-code instruction as | ||
| 161 | * MOV PC,Rm. | ||
| 162 | */ | ||
| 163 | *(u32 *)loc &= 0xf000000f; | ||
| 164 | *(u32 *)loc |= 0x01a0f000; | ||
| 165 | break; | ||
| 166 | |||
| 158 | case R_ARM_PREL31: | 167 | case R_ARM_PREL31: |
| 159 | offset = *(u32 *)loc + sym->st_value - loc; | 168 | offset = *(u32 *)loc + sym->st_value - loc; |
| 160 | *(u32 *)loc = offset & 0x7fffffff; | 169 | *(u32 *)loc = offset & 0x7fffffff; |