Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/headsmp.S between commit 8a3a9dd50dd9 ("ARM:
convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree
and commit 8b438bcb9009 ("ARM: shmobile: Allow use of boot code for
non-SMP case") from the renesas tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-shmobile/headsmp.S
index 293007579b8e,faf82144a262..000000000000
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@@ -10,11 -10,12 +10,13 @@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
- #include <linux/linkage.h>
#include <linux/init.h>
+ #include <linux/linkage.h>
+ #include <linux/threads.h>
+#include <asm/assembler.h>
#include <asm/memory.h>
+ #ifdef CONFIG_SMP
ENTRY(shmobile_invalidate_start)
bl v7_invalidate_l1
b secondary_startup
Attachment:
signature.asc
Description: PGP signature
