TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar
2008-12-29 11:25:11 +01:00
parent 3871f2ffe5 412d0bb553 3c92ec8ae9
commit 0f01f07fad
2756 changed files with 135082 additions and 78311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/trace.c
View File

@@ -321,7 +321,7 @@ __update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
memcpy(data->comm, tsk->comm, TASK_COMM_LEN);
data->pid = tsk->pid;
data->uid = tsk->uid;
data->uid = task_uid(tsk);
data->nice = tsk->static_prio - 20 - MAX_RT_PRIO;
data->policy = tsk->policy;
data->rt_priority = tsk->rt_priority;

6
kernel/trace/trace_functions_graph.c
View File

@@ -592,6 +592,12 @@ print_graph_comment(struct print_entry *trace, struct trace_seq *s,
if (ent->flags & TRACE_FLAG_CONT)
trace_seq_print_cont(s, iter);
/* Strip ending newline */
if (s->buffer[s->len - 1] == '\n') {
s->buffer[s->len - 1] = '\0';
s->len--;
}
ret = trace_seq_printf(s, " */\n");
if (!ret)
return TRACE_TYPE_PARTIAL_LINE;