summaryrefslogtreecommitdiff
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorRoel Kluin <12o3l@tiscali.nl>2008-03-13 17:41:59 +0100
committerIngo Molnar <mingo@elte.hu>2008-03-21 16:43:47 +0100
commit23e3c3cd2e39a3c9d07ee07d882c8cf6ddd61c86 (patch)
treea728df75b68d5648ea6d6627125c48f6d56fe1a8 /kernel/sched.c
parent2070ee01d314ecec8a570c07647ccf4ced6340bb (diff)
downloadlwn-23e3c3cd2e39a3c9d07ee07d882c8cf6ddd61c86.tar.gz
lwn-23e3c3cd2e39a3c9d07ee07d882c8cf6ddd61c86.zip
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 366a90923a3b..573179eb553e 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);