diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-16 23:56:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-16 23:56:52 +0200 |
| commit | 93f3d8f54a22eaa5ae4ec269615729c4f9b1cf1e (patch) | |
| tree | 26651f3df6f92d7dacafb29a9666b66a16e18f5f /kernel/trace/trace_events.c | |
| parent | Merge tag 'printk-for-5.10-fixup' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | tracing: Remove __init from __trace_early_add_new_event() (diff) | |
| download | linux-93f3d8f54a22eaa5ae4ec269615729c4f9b1cf1e.tar.xz linux-93f3d8f54a22eaa5ae4ec269615729c4f9b1cf1e.zip | |
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()
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 29ca60f058ef..47a71f96e5bc 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2498,7 +2498,7 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr) * for enabling events at boot. We want to enable events before * the filesystem is initialized. */ -static __init int +static int __trace_early_add_new_event(struct trace_event_call *call, struct trace_array *tr) { |