Cc: Greentime Hu <greent...@andestech.com>
Signed-off-by: Alan Kao <alan...@andestech.com>
---
 arch/riscv/include/asm/ftrace.h | 1 +
 arch/riscv/kernel/mcount-dyn.S  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrace.h
index 078743aacfd3..fedadc40e358 100644
--- a/arch/riscv/include/asm/ftrace.h
+++ b/arch/riscv/include/asm/ftrace.h
@@ -9,6 +9,7 @@
 #define HAVE_FUNCTION_GRAPH_FP_TEST
 #endif
 
+#define ARCH_SUPPORTS_FTRACE_OPS 1
 #ifndef __ASSEMBLY__
 void _mcount(void);
 static inline unsigned long ftrace_call_adjust(unsigned long addr)
diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S
index 739e07a6fd85..6bbc3f88fcb3 100644
--- a/arch/riscv/kernel/mcount-dyn.S
+++ b/arch/riscv/kernel/mcount-dyn.S
@@ -74,9 +74,12 @@ ENTRY(ftrace_caller)
        /*
         * a0: the address in the caller when calling ftrace_caller
         * a1: the caller's return address
+        * a2: the address of global variable function_trace_op
         */
        ld      a1, -8(s0)
        addi    a0, ra, -MCOUNT_INSN_SIZE
+       la      t5, function_trace_op
+       ld      a2, 0(t5)
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        /*
-- 
2.15.1

Reply via email to