diff --git a/[refs] b/[refs] index fb2b1fcdc587..ed3b0a6c5be4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36ace27e3e60d44ea69ce394b2e45386ae98d9d9 +refs/heads/master: 710390d90f143a9ebb87a475215140f426792efd diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 93474a7935ae..010d5e16b4c5 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2829,14 +2829,14 @@ context_switch(struct rq *rq, struct task_struct *prev, */ arch_start_context_switch(prev); - if (unlikely(!mm)) { + if (likely(!mm)) { next->active_mm = oldmm; atomic_inc(&oldmm->mm_count); enter_lazy_tlb(oldmm, next); } else switch_mm(oldmm, mm, next); - if (unlikely(!prev->mm)) { + if (likely(!prev->mm)) { prev->active_mm = NULL; rq->prev_mm = oldmm; }