aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/ftrace.h3
-rw-r--r--kernel/trace/trace_functions_graph.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 5717e8f81c59..dd16e8218db3 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -777,9 +777,6 @@ struct ftrace_ret_stack {
777extern void return_to_handler(void); 777extern void return_to_handler(void);
778 778
779extern int 779extern int
780ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
781 unsigned long frame_pointer, unsigned long *retp);
782extern int
783function_graph_enter(unsigned long ret, unsigned long func, 780function_graph_enter(unsigned long ret, unsigned long func,
784 unsigned long frame_pointer, unsigned long *retp); 781 unsigned long frame_pointer, unsigned long *retp);
785 782
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 28f2602435d0..88ca787a1cdc 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -118,7 +118,7 @@ print_graph_duration(struct trace_array *tr, unsigned long long duration,
118 struct trace_seq *s, u32 flags); 118 struct trace_seq *s, u32 flags);
119 119
120/* Add a function return address to the trace stack on thread info.*/ 120/* Add a function return address to the trace stack on thread info.*/
121int 121static int
122ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth, 122ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
123 unsigned long frame_pointer, unsigned long *retp) 123 unsigned long frame_pointer, unsigned long *retp)
124{ 124{