diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-19 19:48:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-19 19:48:03 +0200 |
| commit | 29510ec3b626c86de9707bb8904ff940d430289b (patch) | |
| tree | 4e1f579058302cbe7274435a72c64ee54012c192 /kernel/trace/trace_functions.c | |
| parent | 398995ce7980b03b5803f8f31073b45d87746bc1 (diff) | |
| parent | 95950c2ecb31314ef827428e43ff771cf3b037e5 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/trace_functions.c')
| -rw-r--r-- | kernel/trace/trace_functions.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 16aee4d44e8f..8d0e1cc4e974 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -149,11 +149,13 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip) static struct ftrace_ops trace_ops __read_mostly = { .func = function_trace_call, + .flags = FTRACE_OPS_FL_GLOBAL, }; static struct ftrace_ops trace_stack_ops __read_mostly = { .func = function_stack_trace_call, + .flags = FTRACE_OPS_FL_GLOBAL, }; /* Our two options */ |