moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'v5.14-rc7' into android-mainline

Browse Source 
Linux 5.14-rc7

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id690a86aeffe0967fbf4277239dbc934a3694875
This commit is contained in:
Greg Kroah-Hartman
2021-08-27 16:11:14 +02:00
parent 79b3abce09 e22ce8eb63
commit ec118ccf4f
210 changed files with 1503 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/trace/trace.c
View File

@@ -2898,14 +2898,26 @@ int tracepoint_printk_sysctl(struct ctl_table *table, int write,
void trace_event_buffer_commit(struct trace_event_buffer *fbuffer)
{
enum event_trigger_type tt = ETT_NONE;
struct trace_event_file *file = fbuffer->trace_file;
if (__event_trigger_test_discard(file, fbuffer->buffer, fbuffer->event,
fbuffer->entry, &tt))
goto discard;
if (static_key_false(&tracepoint_printk_key.key))
output_printk(fbuffer);
if (static_branch_unlikely(&trace_event_exports_enabled))
ftrace_exports(fbuffer->event, TRACE_EXPORT_EVENT);
event_trigger_unlock_commit_regs(fbuffer->trace_file, fbuffer->buffer,
fbuffer->event, fbuffer->entry,
fbuffer->trace_ctx, fbuffer->regs);
trace_buffer_unlock_commit_regs(file->tr, fbuffer->buffer,
fbuffer->event, fbuffer->trace_ctx, fbuffer->regs);
discard:
if (tt)
event_triggers_post_call(file, tt);
}
EXPORT_SYMBOL_GPL(trace_event_buffer_commit);