2008-03-13 16:42:17

by Roel Kluin

[permalink] [raw]
Subject: [PATCH] kernel/sched.c: remove double unlikely

Combine two unlikely's

Signed-off-by: Roel Kluin <[email protected]>
---
diff --git a/kernel/sched.c b/kernel/sched.c
index 1cb53fb..532a7f4 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3875,7 +3875,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);


2008-03-21 11:35:27

by Ingo Molnar

[permalink] [raw]
Subject: Re: [PATCH] kernel/sched.c: remove double unlikely


* Roel Kluin <[email protected]> wrote:

> Combine two unlikely's

> - unlikely(signal_pending(prev)))) {
> + signal_pending(prev))) {

good catch - thanks, applied.

Ingo