diff --git a/[refs] b/[refs] index 8a882c7cebe1..4a8188f2273f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f04109bf1be7449e27d38ae1bb8465013374bd49 +refs/heads/master: b3a8c34886d0e3dd3a24a5b614ee025181da2f41 diff --git a/trunk/kernel/trace/trace_sched_wakeup.c b/trunk/kernel/trace/trace_sched_wakeup.c index 93cecda650b2..a48c9b4b0c85 100644 --- a/trunk/kernel/trace/trace_sched_wakeup.c +++ b/trunk/kernel/trace/trace_sched_wakeup.c @@ -184,13 +184,10 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev, static void __wakeup_reset(struct trace_array *tr) { - struct trace_array_cpu *data; int cpu; - for_each_possible_cpu(cpu) { - data = tr->data[cpu]; + for_each_possible_cpu(cpu) tracing_reset(tr, cpu); - } wakeup_cpu = -1; wakeup_prio = -1;