lkml.org 
[lkml]   [2014]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/timers 5/5] timers: Make internal_add_timer() update ->next_timer if ->active_timers == 0
    Date
    From: Oleg Nesterov <oleg@redhat.com>

    The internal_add_timer() function updates base->next_timer only if
    timer->expires < base->next_timer. This is correct, but it also makes
    sense to do the same if we add the first non-deferrable timer.

    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    kernel/timer.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/kernel/timer.c b/kernel/timer.c
    index b9cc28271646..e74685309b14 100644
    --- a/kernel/timer.c
    +++ b/kernel/timer.c
    @@ -404,9 +404,9 @@ static void internal_add_timer(struct tvec_base *base, struct timer_list *timer)
    * Update base->active_timers and base->next_timer
    */
    if (!tbase_get_deferrable(timer->base)) {
    - if (time_before(timer->expires, base->next_timer))
    + if (!base->active_timers++ ||
    + time_before(timer->expires, base->next_timer))
    base->next_timer = timer->expires;
    - base->active_timers++;
    }
    base->all_timers++;
    }
    --
    1.8.1.5


    \
     
     \ /
      Last update: 2014-01-16 05:41    [W:4.252 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site