linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 5/8] ARM: Remove dummy loads from the original relocation address
Date: Mon, 21 Jun 2010 11:29:57 +0100	[thread overview]
Message-ID: <20100621102957.9353.12084.stgit@e102109-lin.cambridge.arm.com> (raw)
In-Reply-To: <20100621102639.9353.37648.stgit@e102109-lin.cambridge.arm.com>

Reading back the upper and lower values in the R_ARM_THM_CALL and
R_ARM_THM_JUMP24 case was introduced by a previous commit but they are
not needed.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
 arch/arm/kernel/module.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index ae3c804..aab7fca 100644
--- a/arch/arm/kernel/module.c
+++ b/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:

  parent reply	other threads:[~2010-06-21 10:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-21 10:29 [PATCH v4 0/8] Patches/fixes for 2.6.35 Catalin Marinas
2010-06-21 10:29 ` [PATCH v4 1/8] ARM: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds Catalin Marinas
2010-06-21 10:29 ` [PATCH v4 2/8] ARM: The v6_dma_inv_range() function must preserve data on SMP Catalin Marinas
2010-06-21 10:29 ` [PATCH v4 3/8] ARM: Add a config option for the ARM11MPCore DMA cache maintenance workaround Catalin Marinas
2010-06-21 10:29 ` [PATCH v4 4/8] ARM: Add support for the MOVW/MOVT relocations in Thumb-2 Catalin Marinas
2010-06-21 10:29 ` Catalin Marinas [this message]
2010-06-21 10:30 ` [PATCH v4 6/8] ARM: Do not compile the Thumb-2 module relocations on an ARM kernel Catalin Marinas
2010-06-21 10:30 ` [PATCH v4 7/8] ARM: VExpress: Align the machine_desc.phys_io to 1MB section Catalin Marinas
2010-06-21 10:30 ` [PATCH v4 8/8] ARM: RealView: " Catalin Marinas
2010-06-21 13:19 ` [PATCH v4 0/8] Patches/fixes for 2.6.35 Russell King - ARM Linux

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100621102957.9353.12084.stgit@e102109-lin.cambridge.arm.com \
    --to=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).