diff options
Diffstat (limited to 'kernel/trace/trace_irqsoff.c')
-rw-r--r-- | kernel/trace/trace_irqsoff.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index 887ef88b0bc7..8ff02cbb892f 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c | |||
@@ -160,7 +160,8 @@ static struct ftrace_ops trace_ops __read_mostly = | |||
160 | #endif /* CONFIG_FUNCTION_TRACER */ | 160 | #endif /* CONFIG_FUNCTION_TRACER */ |
161 | 161 | ||
162 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 162 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
163 | static int irqsoff_set_flag(u32 old_flags, u32 bit, int set) | 163 | static int |
164 | irqsoff_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set) | ||
164 | { | 165 | { |
165 | int cpu; | 166 | int cpu; |
166 | 167 | ||
@@ -266,7 +267,8 @@ __trace_function(struct trace_array *tr, | |||
266 | #else | 267 | #else |
267 | #define __trace_function trace_function | 268 | #define __trace_function trace_function |
268 | 269 | ||
269 | static int irqsoff_set_flag(u32 old_flags, u32 bit, int set) | 270 | static int |
271 | irqsoff_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set) | ||
270 | { | 272 | { |
271 | return -EINVAL; | 273 | return -EINVAL; |
272 | } | 274 | } |
@@ -570,8 +572,10 @@ static void irqsoff_function_set(int set) | |||
570 | unregister_irqsoff_function(is_graph()); | 572 | unregister_irqsoff_function(is_graph()); |
571 | } | 573 | } |
572 | 574 | ||
573 | static int irqsoff_flag_changed(struct tracer *tracer, u32 mask, int set) | 575 | static int irqsoff_flag_changed(struct trace_array *tr, u32 mask, int set) |
574 | { | 576 | { |
577 | struct tracer *tracer = tr->current_trace; | ||
578 | |||
575 | if (mask & TRACE_ITER_FUNCTION) | 579 | if (mask & TRACE_ITER_FUNCTION) |
576 | irqsoff_function_set(set); | 580 | irqsoff_function_set(set); |
577 | 581 | ||