From 2ba3f494e49144c276a326dedf8d17dc95be9bb8 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Tue, 24 Nov 2009 11:55:27 +0100
Subject: [PATCH] --- yaml --- r: 169903 b: refs/heads/master c:
 710390d90f143a9ebb87a475215140f426792efd h: refs/heads/master i:   169901:
 9b63edb7304e9cdd4e929b8408f17e4ee7b2cf63   169899:
 580978507392f463901b40a5aae79e327dc40850   169895:
 718379f6274f46efd21d505369533d1960511938   169887:
 063efdc5fdda2ff0f3c4a0851174632922e07bc3 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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;
 	}