diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-07-22 17:51:50 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-25 11:52:49 +0300 |
| commit | 6e6026cd5067c870f50bc230d8949687b2e7cb31 (patch) | |
| tree | fb50c73eb65f9089fa5af20d3009cf0f1352a962 | |
| parent | c376212c32e92ad7a0fbefbd62292494bc38dcfc (diff) | |
| download | linux-6e6026cd5067c870f50bc230d8949687b2e7cb31.tar.xz | |
ARM: davinci: fix sleep.S build error on ARMv4
[ Upstream commit d64b212ea960db4276a1d8372bd98cb861dfcbb0 ]
When building a multiplatform kernel that includes armv4 support,
the default target CPU does not support the blx instruction,
which leads to a build failure:
arch/arm/mach-davinci/sleep.S: Assembler messages:
arch/arm/mach-davinci/sleep.S:56: Error: selected processor does not support `blx ip' in ARM mode
Add a .arch statement in the sources to make this file build.
Link: https://lore.kernel.org/r/20190722145211.1154785-1-arnd@arndb.de
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/arm/mach-davinci/sleep.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S index a5336a5e2739..459d081caf79 100644 --- a/arch/arm/mach-davinci/sleep.S +++ b/arch/arm/mach-davinci/sleep.S @@ -37,6 +37,7 @@ #define DEEPSLEEP_SLEEPENABLE_BIT BIT(31) .text + .arch armv5te /* * Move DaVinci into deep sleep state * |