summaryrefslogtreecommitdiffstats
path: root/kernel/sched/core.c
diff options
context:
space:
mode:
authorFrederic Weisbecker2013-04-12 01:51:00 +0200
committerIngo Molnar2013-05-28 09:40:24 +0200
commit1ad4ec0dc740c4183acd6d6e367ca52b28e4fa94 (patch)
tree9e50109ed63cdf56ed954a845e257cfefe3149c2 /kernel/sched/core.c
parentsched: Update rq clock before setting fair group shares (diff)
downloadkernel-qcow2-linux-1ad4ec0dc740c4183acd6d6e367ca52b28e4fa94.tar.gz
kernel-qcow2-linux-1ad4ec0dc740c4183acd6d6e367ca52b28e4fa94.tar.xz
kernel-qcow2-linux-1ad4ec0dc740c4183acd6d6e367ca52b28e4fa94.zip
sched: Update rq clock before calling check_preempt_curr()
check_preempt_curr() of fair class needs an uptodate sched clock value to update runtime stats of the current task of the target's rq. When a task is woken up, activate_task() is usually called right before ttwu_do_wakeup() unless the task is still in the runqueue. In the latter case we need to update the rq clock explicitly because activate_task() isn't here to do the job for us. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Li Zhong <zhong@linux.vnet.ibm.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Paul Turner <pjt@google.com> Cc: Mike Galbraith <efault@gmx.de> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1365724262-20142-4-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r--kernel/sched/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 7bf0418dc60f..46d00172ae4a 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1365,6 +1365,8 @@ static int ttwu_remote(struct task_struct *p, int wake_flags)
rq = __task_rq_lock(p);
if (p->on_rq) {
+ /* check_preempt_curr() may use rq clock */
+ update_rq_clock(rq);
ttwu_do_wakeup(rq, p, wake_flags);
ret = 1;
}