diff options
Diffstat (limited to 'kernel/trace/trace_functions.c')
-rw-r--r-- | kernel/trace/trace_functions.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index b3a320f8aba7..d067cea2ccc3 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c | |||
@@ -78,7 +78,7 @@ function_trace_call_preempt_only(unsigned long ip, unsigned long parent_ip) | |||
78 | disabled = atomic_inc_return(&data->disabled); | 78 | disabled = atomic_inc_return(&data->disabled); |
79 | 79 | ||
80 | if (likely(disabled == 1)) | 80 | if (likely(disabled == 1)) |
81 | trace_function(tr, data, ip, parent_ip, flags, pc); | 81 | trace_function(tr, ip, parent_ip, flags, pc); |
82 | 82 | ||
83 | atomic_dec(&data->disabled); | 83 | atomic_dec(&data->disabled); |
84 | ftrace_preempt_enable(resched); | 84 | ftrace_preempt_enable(resched); |
@@ -108,7 +108,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip) | |||
108 | 108 | ||
109 | if (likely(disabled == 1)) { | 109 | if (likely(disabled == 1)) { |
110 | pc = preempt_count(); | 110 | pc = preempt_count(); |
111 | trace_function(tr, data, ip, parent_ip, flags, pc); | 111 | trace_function(tr, ip, parent_ip, flags, pc); |
112 | } | 112 | } |
113 | 113 | ||
114 | atomic_dec(&data->disabled); | 114 | atomic_dec(&data->disabled); |
@@ -139,7 +139,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip) | |||
139 | 139 | ||
140 | if (likely(disabled == 1)) { | 140 | if (likely(disabled == 1)) { |
141 | pc = preempt_count(); | 141 | pc = preempt_count(); |
142 | trace_function(tr, data, ip, parent_ip, flags, pc); | 142 | trace_function(tr, ip, parent_ip, flags, pc); |
143 | /* | 143 | /* |
144 | * skip over 5 funcs: | 144 | * skip over 5 funcs: |
145 | * __ftrace_trace_stack, | 145 | * __ftrace_trace_stack, |
@@ -148,7 +148,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip) | |||
148 | * ftrace_list_func | 148 | * ftrace_list_func |
149 | * ftrace_call | 149 | * ftrace_call |
150 | */ | 150 | */ |
151 | __trace_stack(tr, data, flags, 5, pc); | 151 | __trace_stack(tr, flags, 5, pc); |
152 | } | 152 | } |
153 | 153 | ||
154 | atomic_dec(&data->disabled); | 154 | atomic_dec(&data->disabled); |