Merge branch 'linus' into perf/core

[net-next-2.6.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index dc85ceb908322cad7196339f4df8dd58c37b1cec..c0d2067f3e0d81bb45c3372bb39358164612f3a6 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3584,7 +3584,7 @@ void scheduler_tick(void)
        curr->sched_class->task_tick(rq, curr, 0);
        raw_spin_unlock(&rq->lock);
 
-       perf_event_task_tick(curr);
+       perf_event_task_tick();
 
 #ifdef CONFIG_SMP
        rq->idle_at_tick = idle_cpu(cpu);