lkml.org 
[lkml]   [2008]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    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@tiscali.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));

    \
     
     \ /
      Last update: 2008-02-16 18:13    [W:0.018 / U:32.112 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site