Skip to content

Commit 93f3d8f

Browse files
committed
Merge tag 'trace-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt: "Fix mismatch section of adding early trace events. Fixes the issue of a mismatch section that was missed due to gcc inlining the offending function, while clang did not (and reported the issue)" * tag 'trace-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Remove __init from __trace_early_add_new_event()
2 parents 8119c43 + ce66f61 commit 93f3d8f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

kernel/trace/trace_events.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2498,7 +2498,7 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr)
24982498
* for enabling events at boot. We want to enable events before
24992499
* the filesystem is initialized.
25002500
*/
2501-
static __init int
2501+
static int
25022502
__trace_early_add_new_event(struct trace_event_call *call,
25032503
struct trace_array *tr)
25042504
{

0 commit comments

Comments
 (0)