aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Brandenburg <bbb@mpi-sws.org>2013-07-01 16:33:16 -0400
committerBjoern Brandenburg <bbb@mpi-sws.org>2013-08-07 03:46:57 -0400
commit794436e81c3a7dd2baad276dac891cb81ed15ae5 (patch)
tree43ab1888d4f3cc9c18fdd0e2e3604e1f8def0e50
parent3f4976942b46bee1a47a2c46fb50b5624298c978 (diff)
Call LITMUS^RT tick function from Linux tick
-rw-r--r--kernel/sched/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 5e5603fbb538..b6ff5df94241 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -88,6 +88,7 @@
88 88
89#include <litmus/trace.h> 89#include <litmus/trace.h>
90#include <litmus/sched_trace.h> 90#include <litmus/sched_trace.h>
91void litmus_tick(struct rq*, struct task_struct*);
91 92
92#define CREATE_TRACE_POINTS 93#define CREATE_TRACE_POINTS
93#include <trace/events/sched.h> 94#include <trace/events/sched.h>
@@ -401,6 +402,7 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer)
401 raw_spin_lock(&rq->lock); 402 raw_spin_lock(&rq->lock);
402 update_rq_clock(rq); 403 update_rq_clock(rq);
403 rq->curr->sched_class->task_tick(rq, rq->curr, 1); 404 rq->curr->sched_class->task_tick(rq, rq->curr, 1);
405 litmus_tick(rq, rq->curr);
404 raw_spin_unlock(&rq->lock); 406 raw_spin_unlock(&rq->lock);
405 407
406 return HRTIMER_NORESTART; 408 return HRTIMER_NORESTART;
@@ -2762,6 +2764,7 @@ void scheduler_tick(void)
2762 update_rq_clock(rq); 2764 update_rq_clock(rq);
2763 update_cpu_load_active(rq); 2765 update_cpu_load_active(rq);
2764 curr->sched_class->task_tick(rq, curr, 0); 2766 curr->sched_class->task_tick(rq, curr, 0);
2767 litmus_tick(rq, curr);
2765 raw_spin_unlock(&rq->lock); 2768 raw_spin_unlock(&rq->lock);
2766 2769
2767 perf_event_task_tick(); 2770 perf_event_task_tick();