diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2008-03-13 12:41:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-03-21 11:43:47 -0400 |
| commit | 23e3c3cd2e39a3c9d07ee07d882c8cf6ddd61c86 (patch) | |
| tree | a728df75b68d5648ea6d6627125c48f6d56fe1a8 /kernel/sched.c | |
| parent | 2070ee01d314ecec8a570c07647ccf4ced6340bb (diff) | |
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>
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 366a90923a..573179eb55 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -3882,7 +3882,7 @@ need_resched_nonpreemptible: | |||
| 3882 | 3882 | ||
| 3883 | if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) { | 3883 | if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) { |
| 3884 | if (unlikely((prev->state & TASK_INTERRUPTIBLE) && | 3884 | if (unlikely((prev->state & TASK_INTERRUPTIBLE) && |
| 3885 | unlikely(signal_pending(prev)))) { | 3885 | signal_pending(prev))) { |
| 3886 | prev->state = TASK_RUNNING; | 3886 | prev->state = TASK_RUNNING; |
| 3887 | } else { | 3887 | } else { |
| 3888 | deactivate_task(rq, prev, 1); | 3888 | deactivate_task(rq, prev, 1); |
