diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-19 13:48:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-19 13:48:03 -0400 |
| commit | 29510ec3b626c86de9707bb8904ff940d430289b (patch) | |
| tree | 4e1f579058302cbe7274435a72c64ee54012c192 /kernel/trace/trace_irqsoff.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_irqsoff.c')
| -rw-r--r-- | kernel/trace/trace_irqsoff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index a4969b47afc..c77424be284 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c | |||
| @@ -153,6 +153,7 @@ irqsoff_tracer_call(unsigned long ip, unsigned long parent_ip) | |||
| 153 | static struct ftrace_ops trace_ops __read_mostly = | 153 | static struct ftrace_ops trace_ops __read_mostly = |
| 154 | { | 154 | { |
| 155 | .func = irqsoff_tracer_call, | 155 | .func = irqsoff_tracer_call, |
| 156 | .flags = FTRACE_OPS_FL_GLOBAL, | ||
| 156 | }; | 157 | }; |
| 157 | #endif /* CONFIG_FUNCTION_TRACER */ | 158 | #endif /* CONFIG_FUNCTION_TRACER */ |
| 158 | 159 | ||