Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+1
-1
+1
-1
arch/nds32/kernel/ftrace.c
+1
-1
arch/nds32/kernel/ftrace.c
···
6
6
7
7
#ifndef CONFIG_DYNAMIC_FTRACE
8
8
extern void (*ftrace_trace_function)(unsigned long, unsigned long,
9
-
struct ftrace_ops*, struct pt_regs*);
9
+
struct ftrace_ops*, struct ftrace_regs*);
10
10
extern void ftrace_graph_caller(void);
11
11
12
12
noinline void __naked ftrace_stub(unsigned long ip, unsigned long parent_ip,