diff --git a/[refs] b/[refs] index e39e322eebfc..120a260e6565 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19fb518c2a0c5d88ed22bba7083b7e7bc2a9c231 +refs/heads/master: 79b3feffb10417f197d2ab48dd4fa3c0c9e7d788 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index bedda18f37a5..290cf770b712 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -904,7 +904,7 @@ static void yield_task_fair(struct rq *rq) /* * Already in the rightmost position? */ - if (unlikely(rightmost->vruntime < se->vruntime)) + if (unlikely(!rightmost || rightmost->vruntime < se->vruntime)) return; /*