projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5752674
)
tracing/function-graph-tracer: fix merge
author
Ingo Molnar
<mingo@elte.hu>
Thu, 19 Feb 2009 12:01:37 +0000
(13:01 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 19 Feb 2009 12:01:37 +0000
(13:01 +0100)
Merge artifact: pid got changed to ent->pid meanwhile.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/trace_functions_graph.c
patch
|
blob
|
history
diff --git
a/kernel/trace/trace_functions_graph.c
b/kernel/trace/trace_functions_graph.c
index 8f4004a00b4e2c2c8df48bf89d0b3c0e47b6b163..c009553a8e815829cc47658744868d86d66e2d32 100644
(file)
--- a/
kernel/trace/trace_functions_graph.c
+++ b/
kernel/trace/trace_functions_graph.c
@@
-589,7
+589,7
@@
print_graph_entry(struct ftrace_graph_ent_entry *field, struct trace_seq *s,
/* Proc */
if (tracer_flags.val & TRACE_GRAPH_PRINT_PROC) {
- ret = print_graph_proc(s, pid);
+ ret = print_graph_proc(s,
ent->
pid);
if (ret == TRACE_TYPE_PARTIAL_LINE)
return TRACE_TYPE_PARTIAL_LINE;