From: Roel Kluin <12o3l@tiscali.nl>
Date: Thu, 13 Mar 2008 16:41:59 +0000 (+0100)
Subject: sched: remove double unlikely from schedule()
X-Git-Tag: v2.6.25-rc7~38^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23e3c3cd2e39a3c9d07ee07d882c8cf6ddd61c86;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

sched: remove double unlikely from schedule()

Combine two unlikely's

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/sched.c b/kernel/sched.c
index 366a909..573179e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3882,7 +3882,7 @@ need_resched_nonpreemptible:
 
 	if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
 		if (unlikely((prev->state & TASK_INTERRUPTIBLE) &&
-				unlikely(signal_pending(prev)))) {
+				signal_pending(prev))) {
 			prev->state = TASK_RUNNING;
 		} else {
 			deactivate_task(rq, prev, 1);