lkml.org 
[lkml]   [2018]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:timers/core] hrtimer: Factor out __hrtimer_next_event_base()
    Commit-ID:  ad38f596d8e4babc19be8b21a7a49debffb4a7f5
    Gitweb: https://git.kernel.org/tip/ad38f596d8e4babc19be8b21a7a49debffb4a7f5
    Author: Anna-Maria Gleixner <anna-maria@linutronix.de>
    AuthorDate: Thu, 21 Dec 2017 11:41:53 +0100
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Tue, 16 Jan 2018 03:00:43 +0100

    hrtimer: Factor out __hrtimer_next_event_base()

    Preparatory patch for softirq based hrtimers to avoid code duplication.

    No functional change.

    Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: John Stultz <john.stultz@linaro.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: keescook@chromium.org
    Link: http://lkml.kernel.org/r/20171221104205.7269-25-anna-maria@linutronix.de
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    kernel/time/hrtimer.c | 20 ++++++++++++++++----
    1 file changed, 16 insertions(+), 4 deletions(-)

    diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
    index 4142e6f..5d9b81d 100644
    --- a/kernel/time/hrtimer.c
    +++ b/kernel/time/hrtimer.c
    @@ -458,13 +458,13 @@ __next_base(struct hrtimer_cpu_base *cpu_base, unsigned int *active)
    #define for_each_active_base(base, cpu_base, active) \
    while ((base = __next_base((cpu_base), &(active))))

    -static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)
    +static ktime_t __hrtimer_next_event_base(struct hrtimer_cpu_base *cpu_base,
    + unsigned int active,
    + ktime_t expires_next)
    {
    struct hrtimer_clock_base *base;
    - unsigned int active = cpu_base->active_bases;
    - ktime_t expires, expires_next = KTIME_MAX;
    + ktime_t expires;

    - cpu_base->next_timer = NULL;
    for_each_active_base(base, cpu_base, active) {
    struct timerqueue_node *next;
    struct hrtimer *timer;
    @@ -487,6 +487,18 @@ static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)
    return expires_next;
    }

    +static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)
    +{
    + unsigned int active = cpu_base->active_bases;
    + ktime_t expires_next = KTIME_MAX;
    +
    + cpu_base->next_timer = NULL;
    +
    + expires_next = __hrtimer_next_event_base(cpu_base, active, expires_next);
    +
    + return expires_next;
    +}
    +
    static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base)
    {
    ktime_t *offs_real = &base->clock_base[HRTIMER_BASE_REALTIME].offset;
    \
     
     \ /
      Last update: 2018-01-16 04:54    [W:4.065 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site