diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-27 19:41:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-27 19:41:59 +0200 |
| commit | 1fc596a56b334f4d593a2b49e5ff55af6aaa0816 (patch) | |
| tree | e46c54870976913df62563cd643860feb889df0e /arch | |
| parent | Merge tag 'nios2_fixes_for_v5.15_part3' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | ftrace/nds32: Update the proto for ftrace_trace_function to match ftrace_stub (diff) | |
| download | linux-1fc596a56b334f4d593a2b49e5ff55af6aaa0816.tar.xz linux-1fc596a56b334f4d593a2b49e5ff55af6aaa0816.zip | |
Merge tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull nds32 tracing fix from Steven Rostedt:
"Fix nds32le build when DYNAMIC_FTRACE is disabled
A randconfig found that nds32le architecture fails to build due to a
prototype mismatch between a ftrace function pointer and the function
it was to be assigned to. That function pointer prototype missed being
updated when all the ftrace callbacks were updated"
* tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ftrace/nds32: Update the proto for ftrace_trace_function to match ftrace_stub
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nds32/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nds32/kernel/ftrace.c b/arch/nds32/kernel/ftrace.c index 0e23e3a8df6b..d55b73b18149 100644 --- a/arch/nds32/kernel/ftrace.c +++ b/arch/nds32/kernel/ftrace.c @@ -6,7 +6,7 @@ #ifndef CONFIG_DYNAMIC_FTRACE extern void (*ftrace_trace_function)(unsigned long, unsigned long, - struct ftrace_ops*, struct pt_regs*); + struct ftrace_ops*, struct ftrace_regs*); extern void ftrace_graph_caller(void); noinline void __naked ftrace_stub(unsigned long ip, unsigned long parent_ip, |