Messages in this thread Patch in this message | | | Date | Tue, 13 May 2008 23:44:11 +0200 | From | Roel Kluin <> | Subject | [PATCH] sched: unite unlikely pairs in rt_policy() and schedule_debug() |
| |
Removes obfuscation and may improve assembly
Signed-off-by: Roel Kluin <roel.kluin@gmail.com> --- diff --git a/kernel/sched.c b/kernel/sched.c index 8841a91..86a0cd3 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -136,7 +136,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; } @@ -4430,7 +4430,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));
| |