arm64: ftrace: use GLOBAL()
authorMark Rutland <mark.rutland@arm.com>
Thu, 15 Nov 2018 22:41:59 +0000 (22:41 +0000)
committerWill Deacon <will.deacon@arm.com>
Fri, 30 Nov 2018 13:29:04 +0000 (13:29 +0000)
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 <takahiro.akashi@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Torsten Duwe <duwe@suse.de>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/kernel/entry-ftrace.S

index 1175f5827ae17ffabc9f071e46b942c62b530a1f..a3045fa04bd0adfe7309af64ac95182bb6da661f 100644 (file)
@@ -148,14 +148,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