[PATCH 2/6] arm64: ftrace: use GLOBAL()
From: mark.rutland@arm.com (Mark Rutland)
Date: 2018-11-15 22:41:59
Subsystem:
arm64 port (aarch64 architecture), function hooks (ftrace), the rest · Maintainers:
Catalin Marinas, Will Deacon, Steven Rostedt, Masami Hiramatsu, Linus Torvalds
The global exports of ftrace_call and ftrace_graph_call are somewhat painful to read. Let's use the generic GLOBAL() macro to ameliorate matters. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: AKASHI Takahiro <redacted> Cc: Ard Biesheuvel <redacted> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Torsten Duwe <redacted> Cc: Will Deacon <redacted> --- arch/arm64/kernel/entry-ftrace.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S
index 98f029c7d4f4..eb4e50d9f75d 100644
--- a/arch/arm64/kernel/entry-ftrace.S
+++ b/arch/arm64/kernel/entry-ftrace.S@@ -154,14 +154,12 @@ ENTRY(ftrace_caller) mcount_get_pc0 x0 // function's pc mcount_get_lr x1 // function's lr - .global ftrace_call -ftrace_call: // tracer(pc, lr); +GLOBAL(ftrace_call) // tracer(pc, lr); nop // This will be replaced with "bl xxx" // where xxx can be any kind of tracer. #ifdef CONFIG_FUNCTION_GRAPH_TRACER - .global ftrace_graph_call -ftrace_graph_call: // ftrace_graph_caller(); +GLOBAL(ftrace_graph_call) // ftrace_graph_caller(); nop // If enabled, this will be replaced // "b ftrace_graph_caller" #endif
--
2.11.0