From 7549521446d0ec1c388216e674cf2c5e7cb79240 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 21 Jun 2010 15:11:38 +0100 Subject: [PATCH] --- yaml --- r: 208590 b: refs/heads/master c: b749315601b44a63634d1a38fd167b8cac0e9ad4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/module.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cf387ccbe0db..a7fd0a0b33df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0567821cd8aac3f390282e02c9ba633894cbf7c1 +refs/heads/master: b749315601b44a63634d1a38fd167b8cac0e9ad4 diff --git a/trunk/arch/arm/kernel/module.c b/trunk/arch/arm/kernel/module.c index aab7fcaba070..6b4605893f1e 100644 --- a/trunk/arch/arm/kernel/module.c +++ b/trunk/arch/arm/kernel/module.c @@ -102,7 +102,9 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, unsigned long loc; Elf32_Sym *sym; s32 offset; +#ifdef CONFIG_THUMB2_KERNEL u32 upper, lower, sign, j1, j2; +#endif offset = ELF32_R_SYM(rel->r_info); 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, (offset & 0x0fff); break; +#ifdef CONFIG_THUMB2_KERNEL case R_ARM_THM_CALL: case R_ARM_THM_JUMP24: upper = *(u16 *)loc; @@ -266,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",