lkml.org 
[lkml]   [2022]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 04/17] timer: Split next timer interrupt logic
    Date
    Logic for getting next timer interrupt (no matter of recalculated or
    already stored in base->next_expiry) is split into a separate function
    "next_timer_interrupt()" to make it available for new call sites.

    No functional change.

    Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
    Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    kernel/time/timer.c | 14 +++++++++++---
    1 file changed, 11 insertions(+), 3 deletions(-)

    diff --git a/kernel/time/timer.c b/kernel/time/timer.c
    index 7695c733dfa5..f34bc75ff848 100644
    --- a/kernel/time/timer.c
    +++ b/kernel/time/timer.c
    @@ -1681,6 +1681,15 @@ static u64 cmp_next_hrtimer_event(u64 basem, u64 expires)
    return DIV_ROUND_UP_ULL(nextevt, TICK_NSEC) * TICK_NSEC;
    }

    +
    +static unsigned long next_timer_interrupt(struct timer_base *base)
    +{
    + if (base->next_expiry_recalc)
    + __next_timer_interrupt(base);
    +
    + return base->next_expiry;
    +}
    +
    /**
    * get_next_timer_interrupt - return the time (clock mono) of the next timer
    * @basej: base time jiffies
    @@ -1703,9 +1712,8 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
    return expires;

    raw_spin_lock(&base->lock);
    - if (base->next_expiry_recalc)
    - __next_timer_interrupt(base);
    - nextevt = base->next_expiry;
    +
    + nextevt = next_timer_interrupt(base);

    /*
    * We have a fresh next event. Check whether we can forward the
    --
    2.30.2
    \
     
     \ /
      Last update: 2022-10-25 16:00    [W:4.173 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site