diff options
| author | Pavel Machek <pavel@denx.de> | 2012-10-27 01:00:53 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-27 12:39:37 +0200 |
| commit | ad208d03a5a32957a419eb1a473aa96ff4da45ca (patch) | |
| tree | 5f68991c540135d5b598f8b489482c459ce43e56 /arch/arm/mach-socfpga | |
| parent | Merge branch 'socfpga/smp' into next/smp (diff) | |
| download | linux-ad208d03a5a32957a419eb1a473aa96ff4da45ca.tar.xz linux-ad208d03a5a32957a419eb1a473aa96ff4da45ca.zip | |
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>
Diffstat (limited to 'arch/arm/mach-socfpga')
| -rw-r--r-- | arch/arm/mach-socfpga/headsmp.S | 1 |
1 files changed, 1 insertions, 0 deletions
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 |