lkml.org 
[lkml]   [2014]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 14/36] hrtimer: reorder code in __remove_hrtimer()
    Date
    This patch reorders code within __remove_hrtimer() routine to achieve this:
    - no need to check if timer is the next timer to expire when high resolution
    mode isn't configured in kernel. So, move this check within the #ifdef/endif
    block.
    - Validate 'reprogram' and hrtimer_hres_active() first as without these we don't
    need to check if 'timer' is the next one to fire.

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    ---
    kernel/hrtimer.c | 21 ++++++++++-----------
    1 file changed, 10 insertions(+), 11 deletions(-)

    diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
    index 476ad5d..833db9f 100644
    --- a/kernel/hrtimer.c
    +++ b/kernel/hrtimer.c
    @@ -891,19 +891,18 @@ static void __remove_hrtimer(struct hrtimer *timer,

    next_timer = timerqueue_getnext(&base->active);
    timerqueue_del(&base->active, &timer->node);
    - if (&timer->node == next_timer) {
    +
    #ifdef CONFIG_HIGH_RES_TIMERS
    - /* Reprogram the clock event device. if enabled */
    - if (reprogram && base->cpu_base->hres_active) {
    - ktime_t expires;
    -
    - expires = ktime_sub(hrtimer_get_expires(timer),
    - base->offset);
    - if (base->cpu_base->expires_next.tv64 == expires.tv64)
    - hrtimer_force_reprogram(base->cpu_base, 1);
    - }
    -#endif
    + /* Reprogram the clock event device. if enabled */
    + if (reprogram && base->cpu_base->hres_active &&
    + &timer->node == next_timer) {
    + ktime_t expires;
    +
    + expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
    + if (base->cpu_base->expires_next.tv64 == expires.tv64)
    + hrtimer_force_reprogram(base->cpu_base, 1);
    }
    +#endif
    if (!timerqueue_getnext(&base->active))
    base->cpu_base->active_bases &= ~(1 << base->index);
    out:
    --
    1.7.12.rc2.18.g61b472e


    \
     
     \ /
      Last update: 2014-04-04 09:41    [W:3.445 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site