diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2010-05-21 18:06:59 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2010-05-21 18:06:59 +0100 |
| commit | e2889f92687f81326ee8d297637668ee4f97db56 (patch) | |
| tree | 32e78436aaa2c426e814ee0690422c6e8c31f0d4 | |
| parent | dbecfdcd292a1c858d72de748481d40062106ffa (diff) | |
ARM: Do not compile the Thumb-2 module relocations on an ARM kernel
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | arch/arm/kernel/module.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 9ff32972c184..6e0ea9a28498 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -185,6 +185,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, (offset & 0x0fff); break; +#ifdef CONFIG_THUMB2_KERNEL case R_ARM_THM_CALL: case R_ARM_THM_JUMP24: upper = *(u16 *)loc; @@ -268,6 +269,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, ((offset & 0x0700) << 4) | (offset & 0x00ff)); break; +#endif default: printk(KERN_ERR "%s: unknown relocation: %u\n", |