linux-kernel - linux-next: manual merge of the renesas tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 7 Jul 2014 11:32:43 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>,
	Russell King <linux@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Magnus Damm <damm+renesas@...nsource.se>
Subject: linux-next: manual merge of the renesas tree with the arm tree

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@...b.auug.org.au

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

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)