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: Fix hrtimer_start[_range_ns]() function descriptions
    Commit-ID:  6de6250c759781daeadca784d0cc34ae73f3b502
    Gitweb: https://git.kernel.org/tip/6de6250c759781daeadca784d0cc34ae73f3b502
    Author: Anna-Maria Gleixner <anna-maria@linutronix.de>
    AuthorDate: Thu, 21 Dec 2017 11:41:34 +0100
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Tue, 16 Jan 2018 02:35:45 +0100

    hrtimer: Fix hrtimer_start[_range_ns]() function descriptions

    The hrtimer_start[_range_ns]() functions start a timer reliably on this CPU only
    when HRTIMER_MODE_PINNED is set.

    Furthermore the HRTIMER_MODE_PINNED mode is not considered when a hrtimer is initialized.

    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-6-anna-maria@linutronix.de
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    include/linux/hrtimer.h | 6 +++---
    kernel/time/hrtimer.c | 9 +++++----
    2 files changed, 8 insertions(+), 7 deletions(-)

    diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
    index 931ce9c..4e6a884 100644
    --- a/include/linux/hrtimer.h
    +++ b/include/linux/hrtimer.h
    @@ -361,11 +361,11 @@ extern void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
    u64 range_ns, const enum hrtimer_mode mode);

    /**
    - * hrtimer_start - (re)start an hrtimer on the current CPU
    + * hrtimer_start - (re)start an hrtimer
    * @timer: the timer to be added
    * @tim: expiry time
    - * @mode: expiry mode: absolute (HRTIMER_MODE_ABS) or
    - * relative (HRTIMER_MODE_REL)
    + * @mode: timer mode: absolute (HRTIMER_MODE_ABS) or
    + * relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED)
    */
    static inline void hrtimer_start(struct hrtimer *timer, ktime_t tim,
    const enum hrtimer_mode mode)
    diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
    index f2de328..fd08729 100644
    --- a/kernel/time/hrtimer.c
    +++ b/kernel/time/hrtimer.c
    @@ -924,12 +924,12 @@ static inline ktime_t hrtimer_update_lowres(struct hrtimer *timer, ktime_t tim,
    }

    /**
    - * hrtimer_start_range_ns - (re)start an hrtimer on the current CPU
    + * hrtimer_start_range_ns - (re)start an hrtimer
    * @timer: the timer to be added
    * @tim: expiry time
    * @delta_ns: "slack" range for the timer
    - * @mode: expiry mode: absolute (HRTIMER_MODE_ABS) or
    - * relative (HRTIMER_MODE_REL)
    + * @mode: timer mode: absolute (HRTIMER_MODE_ABS) or
    + * relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED)
    */
    void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
    u64 delta_ns, const enum hrtimer_mode mode)
    @@ -1107,7 +1107,8 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
    * hrtimer_init - initialize a timer to the given clock
    * @timer: the timer to be initialized
    * @clock_id: the clock to be used
    - * @mode: timer mode abs/rel
    + * @mode: timer mode: absolute (HRTIMER_MODE_ABS) or
    + * relative (HRTIMER_MODE_REL); pinned is not considered here!
    */
    void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
    enum hrtimer_mode mode)
    \
     
     \ /
      Last update: 2018-01-16 04:46    [W:2.648 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site