From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Cooper <jason@lakedaemon•net>,
andrew@lunn•ch, gregory.clement@free-electrons•com,
linux-arm-kernel@lists•infradead.org,
Russell King <linux@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thomas Petazzoni <thomas.petazzoni@free-electrons•com>
Subject: linux-next: manual merge of the mvebu tree with the arm tree
Date: Mon, 7 Jul 2014 11:28:53 +1000 [thread overview]
Message-ID: <20140707112853.7f5a9323@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/mach-mvebu/headsmp-a9.S between commit 8a3a9dd50dd9 ("ARM:
convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree
and commit 0e2be4c1121a ("ARM: mvebu: fix SMP boot for Armada 38x and
Armada 375 Z1 in big endian") from the mvebu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-mvebu/headsmp-a9.S
index 7c91ddb6f1f7,da5bb292b91c..000000000000
--- a/arch/arm/mach-mvebu/headsmp-a9.S
+++ b/arch/arm/mach-mvebu/headsmp-a9.S
@@@ -14,8 -14,9 +14,10 @@@
#include <linux/linkage.h>
#include <linux/init.h>
+#include <asm/assembler.h>
+ #include <asm/assembler.h>
+
__CPUINIT
#define CPU_RESUME_ADDR_REG 0xf10182d4
@@@ -23,9 -24,13 +25,13 @@@
.global armada_375_smp_cpu1_enable_code_end
armada_375_smp_cpu1_enable_code_start:
- ldr r0, [pc, #4]
+ ARM_BE8(setend be)
+ adr r0, 1f
+ ldr r0, [r0]
ldr r1, [r0]
+ ARM_BE8(rev r1, r1)
- mov pc, r1
+ ret r1
+ 1:
.word CPU_RESUME_ADDR_REG
armada_375_smp_cpu1_enable_code_end:
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-07 1:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-07 1:28 Stephen Rothwell [this message]
2014-07-07 8:22 ` linux-next: manual merge of the mvebu tree with the arm tree Russell King - ARM Linux
-- strict thread matches above, loose matches on Subject: below --
2014-07-17 1:39 Stephen Rothwell
2014-04-28 1:33 Stephen Rothwell
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=20140707112853.7f5a9323@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrew@lunn$(echo .)ch \
--cc=gregory.clement@free-electrons$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=thomas.petazzoni@free-electrons$(echo .)com \
/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