sched: unite unlikely pairs in rt_policy() and schedule_debug()
authorRoel Kluin <roel.kluin@gmail.com>
Tue, 13 May 2008 21:44:11 +0000 (23:44 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 29 May 2008 09:25:14 +0000 (11:25 +0200)
Removes obfuscation and may improve assembly.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched.c

index 4aac8aa16037f4f21182a814a494751dfca162e9..97017356669af9d09aa14075650aa675b85dd0bd 100644 (file)
@@ -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;
 }
@@ -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));