[<prev] [next>] [day] [month] [year] [list]
Message-ID: <47B718E5.6050905@tiscali.nl>
Date: Sat, 16 Feb 2008 18:09:57 +0100
From: Roel Kluin <12o3l@...cali.nl>
To: Ingo Molnar <mingo@...e.hu>, rml@...h9.net
CC: lkml <linux-kernel@...r.kernel.org>
Subject: [PATCH] kernel/sched.c unlikely(x) || unlikely(y) => unlikely(x ||
y)
Not yet tested.
---
Replace unlikely(x) || unlikely(y) by unlikely(x || y)
Signed-off-by: Roel Kluin <12o3l@...cali.nl>
---
diff --git a/kernel/sched.c b/kernel/sched.c
index f28f19e..816c299 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -137,7 +137,7 @@ static inline void sg_inc_cpu_power(struct sched_group *sg, u32 val)
static inline int rt_policy(int policy)
{
- if (unlikely(policy == SCHED_FIFO) || unlikely(policy == SCHED_RR))
+ if (unlikely(policy == SCHED_FIFO || policy == SCHED_RR))
return 1;
return 0;
}
@@ -3832,7 +3832,7 @@ static inline void schedule_debug(struct task_struct *prev)
* schedule() atomically, we ignore that path for now.
* Otherwise, whine if we are scheduling when we should not be.
*/
- if (unlikely(in_atomic_preempt_off()) && unlikely(!prev->exit_state))
+ if (unlikely(in_atomic_preempt_off() && !prev->exit_state))
__schedule_bug(prev);
profile_hit(SCHED_PROFILING, __builtin_return_address(0));
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists