summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-09-17 11:28:50 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-17 12:48:48 +0200
commite9d2b064149ff7ef4acbc65a1b9374ac8b218d3e (patch)
tree6ce885c6052a6e05046b9937376107e4bcf378fe /kernel/sched.c
parent917bdd1c9b7b0f4c22f2504c2f0c1074c8ab9df7 (diff)
downloadop-kernel-dev-e9d2b064149ff7ef4acbc65a1b9374ac8b218d3e.zip
op-kernel-dev-e9d2b064149ff7ef4acbc65a1b9374ac8b218d3e.tar.gz
perf: Undo the per cpu-context timer stuff
Revert the timer per cpu-context timers because of unfortunate nohz interaction. Fixing that would have been somewhat ugly, so go back to driving things from the regular tick. Provide a jiffies interval feature for people who want slower rotations. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Cc: Robert Richter <robert.richter@amd.com> Cc: Yinghai Lu <yinghai@kernel.org> LKML-Reference: <20100917093009.519845633@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 1c3ea7a..794819e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3584,6 +3584,8 @@ void scheduler_tick(void)
curr->sched_class->task_tick(rq, curr, 0);
raw_spin_unlock(&rq->lock);
+ perf_event_task_tick();
+
#ifdef CONFIG_SMP
rq->idle_at_tick = idle_cpu(cpu);
trigger_load_balance(rq, cpu);
OpenPOWER on IntegriCloud