[PATCH] sched: remove branch hints within context_switch()

[Heiko Carstens]

From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>

With 710390d9 "sched: Optimize branch hint in context_switch()" the branch
hint logic within context_switch() got inversed.
In fact the hints "if (likely(!mm))" and "if (likely(!prev->mm))" mean that
it is likely that the previous and next task are kernel threads.
That assumption is certainly counter intuitive, but Tim has shown that at
least with his workload this is true.
Nevertheless the truth is: it depends on the current workload.
So just remove the annotations which also improves readability.

Cc: Tim Blechmann <tim@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
---
 kernel/sched.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index ed09d4f..247a0af 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2852,14 +2852,14 @@ context_switch(struct rq *rq, struct task_struct *prev,
 	 */
 	arch_start_context_switch(prev);
 
-	if (likely(!mm)) {
+	if (!mm) {
 		next->active_mm = oldmm;
 		atomic_inc(&oldmm->mm_count);
 		enter_lazy_tlb(oldmm, next);
 	} else
 		switch_mm(oldmm, mm, next);
 
-	if (likely(!prev->mm)) {
+	if (!prev->mm) {
 		prev->active_mm = NULL;
 		rq->prev_mm = oldmm;
 	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/