Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6de6250c authored by Anna-Maria Gleixner's avatar Anna-Maria Gleixner Committed by Ingo Molnar
Browse files

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: default avatarAnna-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: default avatarIngo Molnar <mingo@kernel.org>
parent 90777713

include/linux/hrtimer.h

+3 −3
Original line number Diff line number Diff line
@@ -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)

kernel/time/hrtimer.c

+5 −4
Original line number Diff line number Diff line
@@ -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)