diff options
| -rw-r--r-- | arch/arm/kernel/module.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index aab7fcaba070..6b4605893f1e 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
| @@ -102,7 +102,9 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, | |||
| 102 | unsigned long loc; | 102 | unsigned long loc; |
| 103 | Elf32_Sym *sym; | 103 | Elf32_Sym *sym; |
| 104 | s32 offset; | 104 | s32 offset; |
| 105 | #ifdef CONFIG_THUMB2_KERNEL | ||
| 105 | u32 upper, lower, sign, j1, j2; | 106 | u32 upper, lower, sign, j1, j2; |
| 107 | #endif | ||
| 106 | 108 | ||
| 107 | offset = ELF32_R_SYM(rel->r_info); | 109 | offset = ELF32_R_SYM(rel->r_info); |
| 108 | if (offset < 0 || offset > (symsec->sh_size / sizeof(Elf32_Sym))) { | 110 | if (offset < 0 || offset > (symsec->sh_size / sizeof(Elf32_Sym))) { |
| @@ -185,6 +187,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, | |||
| 185 | (offset & 0x0fff); | 187 | (offset & 0x0fff); |
| 186 | break; | 188 | break; |
| 187 | 189 | ||
| 190 | #ifdef CONFIG_THUMB2_KERNEL | ||
| 188 | case R_ARM_THM_CALL: | 191 | case R_ARM_THM_CALL: |
| 189 | case R_ARM_THM_JUMP24: | 192 | case R_ARM_THM_JUMP24: |
| 190 | upper = *(u16 *)loc; | 193 | upper = *(u16 *)loc; |
| @@ -266,6 +269,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, | |||
| 266 | ((offset & 0x0700) << 4) | | 269 | ((offset & 0x0700) << 4) | |
| 267 | (offset & 0x00ff)); | 270 | (offset & 0x00ff)); |
| 268 | break; | 271 | break; |
| 272 | #endif | ||
| 269 | 273 | ||
| 270 | default: | 274 | default: |
| 271 | printk(KERN_ERR "%s: unknown relocation: %u\n", | 275 | printk(KERN_ERR "%s: unknown relocation: %u\n", |
