From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Russell King <rmk@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org,
Catalin Marinas <catalin.marinas@arm•com>,
Daniel Silverstone <dsilvers@simtec•co.uk>
Subject: linux-next: manual merge of the arm tree with the arm-current tree
Date: Mon, 23 Mar 2009 11:06:29 +1100 [thread overview]
Message-ID: <20090323110629.664e18d1.sfr@canb.auug.org.au> (raw)
Hi Russell,
Today's linux-next merge of the arm tree got conflictS in
arch/arm/include/asm/elf.h and arch/arm/kernel/module.c between commit
4731f8b66dd34ebf0e67ca6ba9162b0e509bec06 ("[ARM] 5428/1: Module
relocation update for R_ARM_V4BX") from the arm-current tree and commit
2e1926e7b5d39eb31880152d636e8d8d011888cb ("[ARM] 5384/1: unwind: Add
stack unwinding support for loadable modules") from the arm tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/arm/include/asm/elf.h
index ce3b36e,def8eac..0000000
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@@ -50,7 -50,7 +50,8 @@@ typedef struct user_fp elf_fpregset_t
#define R_ARM_ABS32 2
#define R_ARM_CALL 28
#define R_ARM_JUMP24 29
+#define R_ARM_V4BX 40
+ #define R_ARM_PREL31 42
/*
* These are used to set parameters in the core dumps.
diff --cc arch/arm/kernel/module.c
index 9f509fd,13dbd5b..0000000
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@@ -132,15 -155,11 +155,20 @@@ apply_relocate(Elf32_Shdr *sechdrs, con
*(u32 *)loc |= offset & 0x00ffffff;
break;
+ case R_ARM_V4BX:
+ /* Preserve Rm and the condition code. Alter
+ * other bits to re-code instruction as
+ * MOV PC,Rm.
+ */
+ *(u32 *)loc &= 0xf000000f;
+ *(u32 *)loc |= 0x01a0f000;
+ break;
+
+ case R_ARM_PREL31:
+ offset = *(u32 *)loc + sym->st_value - loc;
+ *(u32 *)loc = offset & 0x7fffffff;
+ break;
+
default:
printk(KERN_ERR "%s: unknown relocation: %u\n",
module->name, ELF32_R_TYPE(rel->r_info));
next reply other threads:[~2009-03-23 0:06 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 0:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-12-14 23:54 linux-next: manual merge of the arm tree with the arm-current tree Stephen Rothwell
2010-12-14 23:57 ` Russell King
2010-12-15 12:28 ` Dave Martin
2010-12-15 16:43 ` Russell King
2010-12-05 23:58 Stephen Rothwell
2010-10-11 23:33 Stephen Rothwell
2010-10-12 8:03 ` Uwe Kleine-König
2010-10-12 8:28 ` Russell King
2010-10-12 9:23 ` Uwe Kleine-König
2010-10-12 9:42 ` Russell King
2010-10-12 10:02 ` Uwe Kleine-König
2010-10-12 10:35 ` Sascha Hauer
2010-10-11 1:24 Stephen Rothwell
2010-10-11 7:48 ` Anders Larsen
2010-09-27 4:21 Stephen Rothwell
2010-07-26 1:13 Stephen Rothwell
2010-02-02 0:07 Stephen Rothwell
2010-01-17 23:35 Stephen Rothwell
2010-01-18 1:33 ` Ben Dooks
2010-01-18 3:34 ` Stephen Rothwell
2009-05-06 1:32 Stephen Rothwell
2009-02-15 23:39 Stephen Rothwell
2009-02-16 0:18 ` Ryan Mallon
2009-02-16 0:29 ` Russell King
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=20090323110629.664e18d1.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=catalin.marinas@arm$(echo .)com \
--cc=dsilvers@simtec$(echo .)co.uk \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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