From: Pavel Machek <pavel@denx.de>
Date: Fri, 26 Oct 2012 23:00:53 +0000 (+0200)
Subject: ARM: socfpga: fix build break for allyesconfig
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ad208d03a5a32957a419eb1a473aa96ff4da45ca;p=linux-beck.git

ARM: socfpga: fix build break for allyesconfig

Building a multiplatform kernel with combined armv7 and armv6
kernel does not work with the socfpga smp code, which contains
v7-only instructions. Since this code never runs on armv6,
we can annotate the assmebly with .arch   armv7-a, as suggested
by Russell King.

[arnd: reword commit message]

Signed-off-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 17d6eaf9afff..65762abc4d39 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 
 	__INIT
+	.arch	armv7-a
 
 #define CPU1_START_ADDR 	        0xffd08010