diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-02-05 01:13:37 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:35:47 -0500 |
commit | 7be421510b91491d5aa5a29fa1005712039b95af (patch) | |
tree | 43c85cd688ea4e33b32816bb3f363215d572f052 /kernel/trace/trace_sched_wakeup.c | |
parent | 97e5b191ae7dc0f4f5b82b9db29782928b103b4d (diff) |
trace: Remove unused trace_array_cpu parameter
Impact: cleanup
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_sched_wakeup.c')
-rw-r--r-- | kernel/trace/trace_sched_wakeup.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c index a48c9b4b0c8..96d71648589 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c | |||
@@ -72,7 +72,7 @@ wakeup_tracer_call(unsigned long ip, unsigned long parent_ip) | |||
72 | if (task_cpu(wakeup_task) != cpu) | 72 | if (task_cpu(wakeup_task) != cpu) |
73 | goto unlock; | 73 | goto unlock; |
74 | 74 | ||
75 | trace_function(tr, data, ip, parent_ip, flags, pc); | 75 | trace_function(tr, ip, parent_ip, flags, pc); |
76 | 76 | ||
77 | unlock: | 77 | unlock: |
78 | __raw_spin_unlock(&wakeup_lock); | 78 | __raw_spin_unlock(&wakeup_lock); |
@@ -152,8 +152,8 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev, | |||
152 | if (unlikely(!tracer_enabled || next != wakeup_task)) | 152 | if (unlikely(!tracer_enabled || next != wakeup_task)) |
153 | goto out_unlock; | 153 | goto out_unlock; |
154 | 154 | ||
155 | trace_function(wakeup_trace, data, CALLER_ADDR1, CALLER_ADDR2, flags, pc); | 155 | trace_function(wakeup_trace, CALLER_ADDR1, CALLER_ADDR2, flags, pc); |
156 | tracing_sched_switch_trace(wakeup_trace, data, prev, next, flags, pc); | 156 | tracing_sched_switch_trace(wakeup_trace, prev, next, flags, pc); |
157 | 157 | ||
158 | /* | 158 | /* |
159 | * usecs conversion is slow so we try to delay the conversion | 159 | * usecs conversion is slow so we try to delay the conversion |
@@ -254,10 +254,8 @@ probe_wakeup(struct rq *rq, struct task_struct *p, int success) | |||
254 | 254 | ||
255 | data = wakeup_trace->data[wakeup_cpu]; | 255 | data = wakeup_trace->data[wakeup_cpu]; |
256 | data->preempt_timestamp = ftrace_now(cpu); | 256 | data->preempt_timestamp = ftrace_now(cpu); |
257 | tracing_sched_wakeup_trace(wakeup_trace, data, p, current, | 257 | tracing_sched_wakeup_trace(wakeup_trace, p, current, flags, pc); |
258 | flags, pc); | 258 | trace_function(wakeup_trace, CALLER_ADDR1, CALLER_ADDR2, flags, pc); |
259 | trace_function(wakeup_trace, data, CALLER_ADDR1, CALLER_ADDR2, | ||
260 | flags, pc); | ||
261 | 259 | ||
262 | out_locked: | 260 | out_locked: |
263 | __raw_spin_unlock(&wakeup_lock); | 261 | __raw_spin_unlock(&wakeup_lock); |