]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
sched: remove double unlikely from schedule()
authorRoel Kluin <12o3l@tiscali.nl>
Thu, 13 Mar 2008 16:41:59 +0000 (17:41 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 21 Mar 2008 15:43:47 +0000 (16:43 +0100)
Combine two unlikely's

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

index 366a90923a3bb9fd07a3f2bdca24600b655aff5b..573179eb553e346488f43fa21a2ef07ff1e52085 100644 (file)
@@ -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);