diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-07-22 16:51:50 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-16 10:12:48 +0200 |
commit | 19e7df3e4fe77f788343213103c5d2b054d0ff91 (patch) | |
tree | ef926791427e8c82a233885ff507b80ec66546ec /arch | |
parent | bdce5621e6b04ea5ca34e756f692614d0d264287 (diff) | |
download | linux-stable-19e7df3e4fe77f788343213103c5d2b054d0ff91.tar.gz linux-stable-19e7df3e4fe77f788343213103c5d2b054d0ff91.tar.bz2 linux-stable-19e7df3e4fe77f788343213103c5d2b054d0ff91.zip |
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>
Diffstat (limited to 'arch')
-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 cd350dee4df3..efcd400b2abb 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 * |