Skip to content

Commit

Permalink
sched: unite unlikely pairs in rt_policy() and schedule_debug()
Browse files Browse the repository at this point in the history
Removes obfuscation and may improve assembly.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Roel Kluin authored and Ingo Molnar committed May 29, 2008
1 parent f9305d4 commit 3f33a7c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -4433,7 +4433,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));
Expand Down

0 comments on commit 3f33a7c

Please sign in to comment.