Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

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

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