Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-08-16 22:01:45 +0200
committerJiri Slaby <jslaby@suse.cz>2019-08-16 22:25:10 +0200
commit2e1a9eb726068178ba02918fdcfd29e4e7133edc (patch)
treed1727b17bd6be437bc7f3a0a409ec62928e63c9e
parent2b8ce587a8a52cbf353c24528766725595f0fae9 (diff)
ARM: davinci: fix sleep.S build error on ARMv4 (bnc#1012628).
-rw-r--r--patches.kernel.org/5.2.9-105-ARM-davinci-fix-sleep.S-build-error-on-ARMv4.patch43
-rw-r--r--series.conf1
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.9-105-ARM-davinci-fix-sleep.S-build-error-on-ARMv4.patch b/patches.kernel.org/5.2.9-105-ARM-davinci-fix-sleep.S-build-error-on-ARMv4.patch
new file mode 100644
index 0000000000..12fd932c65
--- /dev/null
+++ b/patches.kernel.org/5.2.9-105-ARM-davinci-fix-sleep.S-build-error-on-ARMv4.patch
@@ -0,0 +1,43 @@
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 22 Jul 2019 16:51:50 +0200
+Subject: [PATCH] ARM: davinci: fix sleep.S build error on ARMv4
+References: bnc#1012628
+Patch-mainline: 5.2.9
+Git-commit: d64b212ea960db4276a1d8372bd98cb861dfcbb0
+
+[ 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>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/arm/mach-davinci/sleep.S | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S
+index 05d03f09ff54..71262dcdbca3 100644
+--- a/arch/arm/mach-davinci/sleep.S
++++ b/arch/arm/mach-davinci/sleep.S
+@@ -24,6 +24,7 @@
+ #define DEEPSLEEP_SLEEPENABLE_BIT BIT(31)
+
+ .text
++ .arch armv5te
+ /*
+ * Move DaVinci into deep sleep state
+ *
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index 4d1ec03fc4..2e509b6f71 100644
--- a/series.conf
+++ b/series.conf
@@ -1125,6 +1125,7 @@
patches.kernel.org/5.2.9-102-ACPI-IORT-Fix-off-by-one-check-in-iort_dev_find.patch
patches.kernel.org/5.2.9-103-nvme-ignore-subnqn-for-ADATA-SX6000LNP.patch
patches.kernel.org/5.2.9-104-nvme-fix-memory-leak-caused-by-incorrect-subsys.patch
+ patches.kernel.org/5.2.9-105-ARM-davinci-fix-sleep.S-build-error-on-ARMv4.patch
########################################################
# Build fixes that apply to the vanilla kernel too.