aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorWanpeng Li <wanpeng.li@linux.intel.com>2014-11-10 20:52:26 -0500
committerIngo Molnar <mingo@kernel.org>2014-11-16 04:59:03 -0500
commit36ce98818a4df66c8134c31fd6e768b4119c7a90 (patch)
tree6ed404c208d89ecaaa2d2ddb4f60d137b31096c3 /kernel/sched
parentd8b163c4c657478ef33c082cff78d03a4ca07bb2 (diff)
sched/deadline: Introduce start_hrtick_dl() for !CONFIG_SCHED_HRTICK
Introduce start_hrtick_dl for !CONFIG_SCHED_HRTICK to align with the fair class. Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Juri Lelli <juri.lelli@arm.com> Cc: Kirill Tkhai <ktkhai@parallels.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/1415670747-58726-1-git-send-email-wanpeng.li@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/deadline.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index 9594c128ff17..e5db8c6feebd 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -1013,6 +1013,10 @@ static void start_hrtick_dl(struct rq *rq, struct task_struct *p)
1013{ 1013{
1014 hrtick_start(rq, p->dl.runtime); 1014 hrtick_start(rq, p->dl.runtime);
1015} 1015}
1016#else /* !CONFIG_SCHED_HRTICK */
1017static void start_hrtick_dl(struct rq *rq, struct task_struct *p)
1018{
1019}
1016#endif 1020#endif
1017 1021
1018static struct sched_dl_entity *pick_next_dl_entity(struct rq *rq, 1022static struct sched_dl_entity *pick_next_dl_entity(struct rq *rq,
@@ -1066,10 +1070,8 @@ struct task_struct *pick_next_task_dl(struct rq *rq, struct task_struct *prev)
1066 /* Running task will never be pushed. */ 1070 /* Running task will never be pushed. */
1067 dequeue_pushable_dl_task(rq, p); 1071 dequeue_pushable_dl_task(rq, p);
1068 1072
1069#ifdef CONFIG_SCHED_HRTICK
1070 if (hrtick_enabled(rq)) 1073 if (hrtick_enabled(rq))
1071 start_hrtick_dl(rq, p); 1074 start_hrtick_dl(rq, p);
1072#endif
1073 1075
1074 set_post_schedule(rq); 1076 set_post_schedule(rq);
1075 1077
@@ -1088,10 +1090,8 @@ static void task_tick_dl(struct rq *rq, struct task_struct *p, int queued)
1088{ 1090{
1089 update_curr_dl(rq); 1091 update_curr_dl(rq);
1090 1092
1091#ifdef CONFIG_SCHED_HRTICK
1092 if (hrtick_enabled(rq) && queued && p->dl.runtime > 0) 1093 if (hrtick_enabled(rq) && queued && p->dl.runtime > 0)
1093 start_hrtick_dl(rq, p); 1094 start_hrtick_dl(rq, p);
1094#endif
1095} 1095}
1096 1096
1097static void task_fork_dl(struct task_struct *p) 1097static void task_fork_dl(struct task_struct *p)