diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-11 13:39:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-11 13:39:33 +0100 |
| commit | 915a0b575fdb2376135ed9334b3ccb1eb51db622 (patch) | |
| tree | 12070fc07897e0cd9170aeb351a96923d44d7813 /kernel/trace/ftrace.c | |
| parent | e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (diff) | |
| parent | 0e95017355dcf43031da6d0e360a748717e56df1 (diff) | |
| download | blackbird-op-linux-915a0b575fdb2376135ed9334b3ccb1eb51db622.tar.gz blackbird-op-linux-915a0b575fdb2376135ed9334b3ccb1eb51db622.zip | |
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 83783579378f..d4d1238b096b 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -84,10 +84,6 @@ ftrace_func_t ftrace_trace_function __read_mostly = ftrace_stub; ftrace_func_t __ftrace_trace_function __read_mostly = ftrace_stub; ftrace_func_t ftrace_pid_function __read_mostly = ftrace_stub; -#ifdef CONFIG_FUNCTION_GRAPH_TRACER -static int ftrace_set_func(unsigned long *array, int *idx, char *buffer); -#endif - static void ftrace_list_func(unsigned long ip, unsigned long parent_ip) { struct ftrace_ops *op = ftrace_list; @@ -2276,6 +2272,8 @@ __setup("ftrace_filter=", set_ftrace_filter); #ifdef CONFIG_FUNCTION_GRAPH_TRACER static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata; +static int ftrace_set_func(unsigned long *array, int *idx, char *buffer); + static int __init set_graph_function(char *str) { strlcpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE); |
