---

yaml --- r: 191442 b: refs/heads/master c: d7a8d9e h: refs/heads/master v: v3
git-mirror · Apr 26, 2010 · 30c8ebb · 30c8ebb
1 parent 6c8c9fc
commit 30c8ebb
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 57 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9106b69382912ddc403a307b69bf894a6f3004e4
+refs/heads/master: d7a8d9e907cc294ec7a4a7046d1886375fbcc82e
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
@@ -491,7 +491,9 @@ extern int trace_clock_id;
 
 /* Standard output formatting function used for function return traces */
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-extern enum print_line_t print_graph_function(struct trace_iterator *iter);
+extern enum print_line_t
+print_graph_function_flags(struct trace_iterator *iter, u32 flags);
+extern void print_graph_headers_flags(struct seq_file *s, u32 flags);
 extern enum print_line_t
 trace_print_graph_duration(unsigned long long duration, struct trace_seq *s);
 
@@ -524,7 +526,7 @@ static inline int ftrace_graph_addr(unsigned long addr)
 #endif /* CONFIG_DYNAMIC_FTRACE */
 #else /* CONFIG_FUNCTION_GRAPH_TRACER */
 static inline enum print_line_t
-print_graph_function(struct trace_iterator *iter)
+print_graph_function_flags(struct trace_iterator *iter, u32 flags)
 {
 	return TRACE_TYPE_UNHANDLED;
 }