From 02fe16800420e86bc0bb0158497acd3cacf43206 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 21 Jun 2010 15:11:08 +0100 Subject: [PATCH] --- yaml --- r: 208589 b: refs/heads/master c: 0567821cd8aac3f390282e02c9ba633894cbf7c1 h: refs/heads/master i: 208587: 4c175b1f58d13646db339d4d684f7825344b0c1b v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/module.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3670dd3b98b9..cf387ccbe0db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dd47741d191400c46173ed9fba9d14b4033ce23 +refs/heads/master: 0567821cd8aac3f390282e02c9ba633894cbf7c1 diff --git a/trunk/arch/arm/kernel/module.c b/trunk/arch/arm/kernel/module.c index ae3c80453a09..aab7fcaba070 100644 --- a/trunk/arch/arm/kernel/module.c +++ b/trunk/arch/arm/kernel/module.c @@ -233,8 +233,6 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, *(u16 *)(loc + 2) = (u16)((lower & 0xd000) | (j1 << 13) | (j2 << 11) | ((offset >> 1) & 0x07ff)); - upper = *(u16 *)loc; - lower = *(u16 *)(loc + 2); break; case R_ARM_THM_MOVW_ABS_NC: