diff mbox series

[v5,22/34] tracing: Rename ftrace_regs_return_value to ftrace_regs_get_return_value

Message ID 170290535934.220107.9998902467249003656.stgit@devnote2 (mailing list archive)
State Not Applicable
Headers show
Series tracing: fprobe: function_graph: Multi-function graph and fprobe on fgraph | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-PR fail PR summary
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18 and -O2 optimization
bpf/vmtest-bpf-next-VM_Test-22 fail Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-31 fail Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-32 fail Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-38 fail Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-39 fail Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 fail Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-13 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-15 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-7 fail Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 fail Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-18 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / veristat

Commit Message

Masami Hiramatsu (Google) Dec. 18, 2023, 1:15 p.m. UTC 
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Rename ftrace_regs_return_value to ftrace_regs_get_return_value as same as
other ftrace_regs_get/set_* APIs.

Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
---
 Changes in v3:
  - Newly added.
---
 arch/loongarch/include/asm/ftrace.h |    2 +-
 arch/powerpc/include/asm/ftrace.h   |    2 +-
 arch/s390/include/asm/ftrace.h      |    2 +-
 arch/x86/include/asm/ftrace.h       |    2 +-
 include/linux/ftrace.h              |    2 +-
 kernel/trace/fgraph.c               |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Comments

Mark Rutland Jan. 5, 2024, 5:14 p.m. UTC | #1 
On Mon, Dec 18, 2023 at 10:15:59PM +0900, Masami Hiramatsu (Google) wrote:
> From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> 
> Rename ftrace_regs_return_value to ftrace_regs_get_return_value as same as
> other ftrace_regs_get/set_* APIs.
> 
> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Acked-by: Mark Rutland <mark.rutland@arm.com>

Since this is a trivial cleanup, it might make sense to move this to the start
of the series, so that it can be queued even if the later parts need more work.

Mark.

> ---
>  Changes in v3:
>   - Newly added.
> ---
>  arch/loongarch/include/asm/ftrace.h |    2 +-
>  arch/powerpc/include/asm/ftrace.h   |    2 +-
>  arch/s390/include/asm/ftrace.h      |    2 +-
>  arch/x86/include/asm/ftrace.h       |    2 +-
>  include/linux/ftrace.h              |    2 +-
>  kernel/trace/fgraph.c               |    2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h
> index a11996eb5892..a9c3d0f2f941 100644
> --- a/arch/loongarch/include/asm/ftrace.h
> +++ b/arch/loongarch/include/asm/ftrace.h
> @@ -70,7 +70,7 @@ ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, unsigned long ip)
>  	regs_get_kernel_argument(&(fregs)->regs, n)
>  #define ftrace_regs_get_stack_pointer(fregs) \
>  	kernel_stack_pointer(&(fregs)->regs)
> -#define ftrace_regs_return_value(fregs) \
> +#define ftrace_regs_get_return_value(fregs) \
>  	regs_return_value(&(fregs)->regs)
>  #define ftrace_regs_set_return_value(fregs, ret) \
>  	regs_set_return_value(&(fregs)->regs, ret)
> diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
> index 9e5a39b6a311..7e138e0e3baf 100644
> --- a/arch/powerpc/include/asm/ftrace.h
> +++ b/arch/powerpc/include/asm/ftrace.h
> @@ -69,7 +69,7 @@ ftrace_regs_get_instruction_pointer(struct ftrace_regs *fregs)
>  	regs_get_kernel_argument(&(fregs)->regs, n)
>  #define ftrace_regs_get_stack_pointer(fregs) \
>  	kernel_stack_pointer(&(fregs)->regs)
> -#define ftrace_regs_return_value(fregs) \
> +#define ftrace_regs_get_return_value(fregs) \
>  	regs_return_value(&(fregs)->regs)
>  #define ftrace_regs_set_return_value(fregs, ret) \
>  	regs_set_return_value(&(fregs)->regs, ret)
> diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h
> index 5a82b08f03cd..01e775c98425 100644
> --- a/arch/s390/include/asm/ftrace.h
> +++ b/arch/s390/include/asm/ftrace.h
> @@ -88,7 +88,7 @@ ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs,
>  	regs_get_kernel_argument(&(fregs)->regs, n)
>  #define ftrace_regs_get_stack_pointer(fregs) \
>  	kernel_stack_pointer(&(fregs)->regs)
> -#define ftrace_regs_return_value(fregs) \
> +#define ftrace_regs_get_return_value(fregs) \
>  	regs_return_value(&(fregs)->regs)
>  #define ftrace_regs_set_return_value(fregs, ret) \
>  	regs_set_return_value(&(fregs)->regs, ret)
> diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
> index 0b306c82855d..a061f8832b20 100644
> --- a/arch/x86/include/asm/ftrace.h
> +++ b/arch/x86/include/asm/ftrace.h
> @@ -64,7 +64,7 @@ arch_ftrace_get_regs(struct ftrace_regs *fregs)
>  	regs_get_kernel_argument(&(fregs)->regs, n)
>  #define ftrace_regs_get_stack_pointer(fregs) \
>  	kernel_stack_pointer(&(fregs)->regs)
> -#define ftrace_regs_return_value(fregs) \
> +#define ftrace_regs_get_return_value(fregs) \
>  	regs_return_value(&(fregs)->regs)
>  #define ftrace_regs_set_return_value(fregs, ret) \
>  	regs_set_return_value(&(fregs)->regs, ret)
> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> index 79875a00c02b..da2a23f5a9ed 100644
> --- a/include/linux/ftrace.h
> +++ b/include/linux/ftrace.h
> @@ -187,7 +187,7 @@ static __always_inline bool ftrace_regs_has_args(struct ftrace_regs *fregs)
>  	regs_get_kernel_argument(ftrace_get_regs(fregs), n)
>  #define ftrace_regs_get_stack_pointer(fregs) \
>  	kernel_stack_pointer(ftrace_get_regs(fregs))
> -#define ftrace_regs_return_value(fregs) \
> +#define ftrace_regs_get_return_value(fregs) \
>  	regs_return_value(ftrace_get_regs(fregs))
>  #define ftrace_regs_set_return_value(fregs, ret) \
>  	regs_set_return_value(ftrace_get_regs(fregs), ret)
> diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
> index 088432b695a6..9a60acaacc96 100644
> --- a/kernel/trace/fgraph.c
> +++ b/kernel/trace/fgraph.c
> @@ -783,7 +783,7 @@ static void fgraph_call_retfunc(struct ftrace_regs *fregs,
>  	trace.rettime = trace_clock_local();
>  #ifdef CONFIG_FUNCTION_GRAPH_RETVAL
>  	if (fregs)
> -		trace.retval = ftrace_regs_return_value(fregs);
> +		trace.retval = ftrace_regs_get_return_value(fregs);
>  	else
>  		trace.retval = fgraph_ret_regs_return_value(ret_regs);
>  #endif
>
Masami Hiramatsu (Google) Jan. 8, 2024, 1:09 a.m. UTC | #2 
On Fri, 5 Jan 2024 17:14:06 +0000
Mark Rutland <mark.rutland@arm.com> wrote:

> On Mon, Dec 18, 2023 at 10:15:59PM +0900, Masami Hiramatsu (Google) wrote:
> > From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> > 
> > Rename ftrace_regs_return_value to ftrace_regs_get_return_value as same as
> > other ftrace_regs_get/set_* APIs.
> > 
> > Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> 
> Acked-by: Mark Rutland <mark.rutland@arm.com>
> 
> Since this is a trivial cleanup, it might make sense to move this to the start
> of the series, so that it can be queued even if the later parts need more work.

Thanks for your Ack! and OK, let me move this to the start of this series.

> 
> Mark.
> 
> > ---
> >  Changes in v3:
> >   - Newly added.
> > ---
> >  arch/loongarch/include/asm/ftrace.h |    2 +-
> >  arch/powerpc/include/asm/ftrace.h   |    2 +-
> >  arch/s390/include/asm/ftrace.h      |    2 +-
> >  arch/x86/include/asm/ftrace.h       |    2 +-
> >  include/linux/ftrace.h              |    2 +-
> >  kernel/trace/fgraph.c               |    2 +-
> >  6 files changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h
> > index a11996eb5892..a9c3d0f2f941 100644
> > --- a/arch/loongarch/include/asm/ftrace.h
> > +++ b/arch/loongarch/include/asm/ftrace.h
> > @@ -70,7 +70,7 @@ ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, unsigned long ip)
> >  	regs_get_kernel_argument(&(fregs)->regs, n)
> >  #define ftrace_regs_get_stack_pointer(fregs) \
> >  	kernel_stack_pointer(&(fregs)->regs)
> > -#define ftrace_regs_return_value(fregs) \
> > +#define ftrace_regs_get_return_value(fregs) \
> >  	regs_return_value(&(fregs)->regs)
> >  #define ftrace_regs_set_return_value(fregs, ret) \
> >  	regs_set_return_value(&(fregs)->regs, ret)
> > diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
> > index 9e5a39b6a311..7e138e0e3baf 100644
> > --- a/arch/powerpc/include/asm/ftrace.h
> > +++ b/arch/powerpc/include/asm/ftrace.h
> > @@ -69,7 +69,7 @@ ftrace_regs_get_instruction_pointer(struct ftrace_regs *fregs)
> >  	regs_get_kernel_argument(&(fregs)->regs, n)
> >  #define ftrace_regs_get_stack_pointer(fregs) \
> >  	kernel_stack_pointer(&(fregs)->regs)
> > -#define ftrace_regs_return_value(fregs) \
> > +#define ftrace_regs_get_return_value(fregs) \
> >  	regs_return_value(&(fregs)->regs)
> >  #define ftrace_regs_set_return_value(fregs, ret) \
> >  	regs_set_return_value(&(fregs)->regs, ret)
> > diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h
> > index 5a82b08f03cd..01e775c98425 100644
> > --- a/arch/s390/include/asm/ftrace.h
> > +++ b/arch/s390/include/asm/ftrace.h
> > @@ -88,7 +88,7 @@ ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs,
> >  	regs_get_kernel_argument(&(fregs)->regs, n)
> >  #define ftrace_regs_get_stack_pointer(fregs) \
> >  	kernel_stack_pointer(&(fregs)->regs)
> > -#define ftrace_regs_return_value(fregs) \
> > +#define ftrace_regs_get_return_value(fregs) \
> >  	regs_return_value(&(fregs)->regs)
> >  #define ftrace_regs_set_return_value(fregs, ret) \
> >  	regs_set_return_value(&(fregs)->regs, ret)
> > diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
> > index 0b306c82855d..a061f8832b20 100644
> > --- a/arch/x86/include/asm/ftrace.h
> > +++ b/arch/x86/include/asm/ftrace.h
> > @@ -64,7 +64,7 @@ arch_ftrace_get_regs(struct ftrace_regs *fregs)
> >  	regs_get_kernel_argument(&(fregs)->regs, n)
> >  #define ftrace_regs_get_stack_pointer(fregs) \
> >  	kernel_stack_pointer(&(fregs)->regs)
> > -#define ftrace_regs_return_value(fregs) \
> > +#define ftrace_regs_get_return_value(fregs) \
> >  	regs_return_value(&(fregs)->regs)
> >  #define ftrace_regs_set_return_value(fregs, ret) \
> >  	regs_set_return_value(&(fregs)->regs, ret)
> > diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> > index 79875a00c02b..da2a23f5a9ed 100644
> > --- a/include/linux/ftrace.h
> > +++ b/include/linux/ftrace.h
> > @@ -187,7 +187,7 @@ static __always_inline bool ftrace_regs_has_args(struct ftrace_regs *fregs)
> >  	regs_get_kernel_argument(ftrace_get_regs(fregs), n)
> >  #define ftrace_regs_get_stack_pointer(fregs) \
> >  	kernel_stack_pointer(ftrace_get_regs(fregs))
> > -#define ftrace_regs_return_value(fregs) \
> > +#define ftrace_regs_get_return_value(fregs) \
> >  	regs_return_value(ftrace_get_regs(fregs))
> >  #define ftrace_regs_set_return_value(fregs, ret) \
> >  	regs_set_return_value(ftrace_get_regs(fregs), ret)
> > diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
> > index 088432b695a6..9a60acaacc96 100644
> > --- a/kernel/trace/fgraph.c
> > +++ b/kernel/trace/fgraph.c
> > @@ -783,7 +783,7 @@ static void fgraph_call_retfunc(struct ftrace_regs *fregs,
> >  	trace.rettime = trace_clock_local();
> >  #ifdef CONFIG_FUNCTION_GRAPH_RETVAL
> >  	if (fregs)
> > -		trace.retval = ftrace_regs_return_value(fregs);
> > +		trace.retval = ftrace_regs_get_return_value(fregs);
> >  	else
> >  		trace.retval = fgraph_ret_regs_return_value(ret_regs);
> >  #endif
> >
diff mbox series

Patch

diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h
index a11996eb5892..a9c3d0f2f941 100644
--- a/arch/loongarch/include/asm/ftrace.h
+++ b/arch/loongarch/include/asm/ftrace.h
@@ -70,7 +70,7 @@  ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, unsigned long ip)
 	regs_get_kernel_argument(&(fregs)->regs, n)
 #define ftrace_regs_get_stack_pointer(fregs) \
 	kernel_stack_pointer(&(fregs)->regs)
-#define ftrace_regs_return_value(fregs) \
+#define ftrace_regs_get_return_value(fregs) \
 	regs_return_value(&(fregs)->regs)
 #define ftrace_regs_set_return_value(fregs, ret) \
 	regs_set_return_value(&(fregs)->regs, ret)
diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
index 9e5a39b6a311..7e138e0e3baf 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@ -69,7 +69,7 @@  ftrace_regs_get_instruction_pointer(struct ftrace_regs *fregs)
 	regs_get_kernel_argument(&(fregs)->regs, n)
 #define ftrace_regs_get_stack_pointer(fregs) \
 	kernel_stack_pointer(&(fregs)->regs)
-#define ftrace_regs_return_value(fregs) \
+#define ftrace_regs_get_return_value(fregs) \
 	regs_return_value(&(fregs)->regs)
 #define ftrace_regs_set_return_value(fregs, ret) \
 	regs_set_return_value(&(fregs)->regs, ret)
diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h
index 5a82b08f03cd..01e775c98425 100644
--- a/arch/s390/include/asm/ftrace.h
+++ b/arch/s390/include/asm/ftrace.h
@@ -88,7 +88,7 @@  ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs,
 	regs_get_kernel_argument(&(fregs)->regs, n)
 #define ftrace_regs_get_stack_pointer(fregs) \
 	kernel_stack_pointer(&(fregs)->regs)
-#define ftrace_regs_return_value(fregs) \
+#define ftrace_regs_get_return_value(fregs) \
 	regs_return_value(&(fregs)->regs)
 #define ftrace_regs_set_return_value(fregs, ret) \
 	regs_set_return_value(&(fregs)->regs, ret)
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index 0b306c82855d..a061f8832b20 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -64,7 +64,7 @@  arch_ftrace_get_regs(struct ftrace_regs *fregs)
 	regs_get_kernel_argument(&(fregs)->regs, n)
 #define ftrace_regs_get_stack_pointer(fregs) \
 	kernel_stack_pointer(&(fregs)->regs)
-#define ftrace_regs_return_value(fregs) \
+#define ftrace_regs_get_return_value(fregs) \
 	regs_return_value(&(fregs)->regs)
 #define ftrace_regs_set_return_value(fregs, ret) \
 	regs_set_return_value(&(fregs)->regs, ret)
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 79875a00c02b..da2a23f5a9ed 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -187,7 +187,7 @@  static __always_inline bool ftrace_regs_has_args(struct ftrace_regs *fregs)
 	regs_get_kernel_argument(ftrace_get_regs(fregs), n)
 #define ftrace_regs_get_stack_pointer(fregs) \
 	kernel_stack_pointer(ftrace_get_regs(fregs))
-#define ftrace_regs_return_value(fregs) \
+#define ftrace_regs_get_return_value(fregs) \
 	regs_return_value(ftrace_get_regs(fregs))
 #define ftrace_regs_set_return_value(fregs, ret) \
 	regs_set_return_value(ftrace_get_regs(fregs), ret)
diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
index 088432b695a6..9a60acaacc96 100644
--- a/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@ -783,7 +783,7 @@  static void fgraph_call_retfunc(struct ftrace_regs *fregs,
 	trace.rettime = trace_clock_local();
 #ifdef CONFIG_FUNCTION_GRAPH_RETVAL
 	if (fregs)
-		trace.retval = ftrace_regs_return_value(fregs);
+		trace.retval = ftrace_regs_get_return_value(fregs);
 	else
 		trace.retval = fgraph_ret_regs_return_value(ret_regs);
 #endif