summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-02-14 22:32:58 +0100
committerSeung-Woo Kim <sw0312.kim@samsung.com>2019-11-19 16:26:17 +0900
commit50bf80beb282c0588da028c5bb97e9aa319fe102 (patch)
tree1204d3ee7139ef4d8d1729f7d880a2ac132ff67f
parent102e9dead1a601a18fc2299284ee64f9c400bdca (diff)
downloadlinux-4.9-exynos9110-50bf80beb282c0588da028c5bb97e9aa319fe102.tar.gz
linux-4.9-exynos9110-50bf80beb282c0588da028c5bb97e9aa319fe102.tar.bz2
linux-4.9-exynos9110-50bf80beb282c0588da028c5bb97e9aa319fe102.zip
arm64: include asm/assembler.h in entry-ftrace.S
In a randconfig build I ran into this build error: arch/arm64/kernel/entry-ftrace.S: Assembler messages: arch/arm64/kernel/entry-ftrace.S:101: Error: unknown mnemonic `ldr_l' -- `ldr_l x2,ftrace_trace_function' The macro is defined in asm/assembler.h, so we should include that file. Fixes: 829d2bd13392 ("arm64: entry-ftrace.S: avoid open-coded {adr,ldr}_l") Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Will Deacon <will.deacon@arm.com> [sw0312.kim: cherry-pick mainline commit f705d954634d to apply function_graph related patch] Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Change-Id: Ifeb122550ece026c45bd5509f0ba86adb0228e24
-rw-r--r--arch/arm64/kernel/entry-ftrace.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S
index 8f1905b795f3..e1be42e11ff5 100644
--- a/arch/arm64/kernel/entry-ftrace.S
+++ b/arch/arm64/kernel/entry-ftrace.S
@@ -10,6 +10,7 @@
*/
#include <linux/linkage.h>
+#include <asm/assembler.h>
#include <asm/ftrace.h>
#include <asm/insn.h>