---

yaml --- r: 169903 b: refs/heads/master c: 710390d h: refs/heads/master i: 169901: 9b63edb 169899: 5809785 169895: 718379f 169887: 063efdc v: v3
git-mirror · Nov 24, 2009 · 2ba3f49 · 2ba3f49
1 parent 653964c
commit 2ba3f49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 	}