|
@@ -2845,14 +2845,14 @@ context_switch(struct rq *rq, struct task_struct *prev,
|
|
*/
|
|
*/
|
|
arch_start_context_switch(prev);
|
|
arch_start_context_switch(prev);
|
|
|
|
|
|
- if (likely(!mm)) {
|
|
|
|
|
|
+ if (!mm) {
|
|
next->active_mm = oldmm;
|
|
next->active_mm = oldmm;
|
|
atomic_inc(&oldmm->mm_count);
|
|
atomic_inc(&oldmm->mm_count);
|
|
enter_lazy_tlb(oldmm, next);
|
|
enter_lazy_tlb(oldmm, next);
|
|
} else
|
|
} else
|
|
switch_mm(oldmm, mm, next);
|
|
switch_mm(oldmm, mm, next);
|
|
|
|
|
|
- if (likely(!prev->mm)) {
|
|
|
|
|
|
+ if (!prev->mm) {
|
|
prev->active_mm = NULL;
|
|
prev->active_mm = NULL;
|
|
rq->prev_mm = oldmm;
|
|
rq->prev_mm = oldmm;
|
|
}
|
|
}
|