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

Commit 952bbc87 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] hrtimers: set correct initial expiry time for relative SIGEV_NONE timers 



The expiry time for relative timers with SIGEV_NONE set was never
updated to the correct value.

Pointed out by George Anzinger.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 66188fae

kernel/posix-timers.c

+6 −1
Original line number Diff line number Diff line
@@ -724,8 +724,13 @@ common_timer_set(struct k_itimer *timr, int flags, 
	timr->it.real.interval = timespec_to_ktime(new_setting->it_interval);



	/* SIGEV_NONE timers are not queued ! See common_timer_get */

	if (((timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE))

	if (((timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE)) {

		/* Setup correct expiry time for relative timers */

		if (mode == HRTIMER_REL)

			timer->expires = ktime_add(timer->expires,

						   timer->base->get_time());

		return 0;

	}



	hrtimer_start(timer, timer->expires, mode);

	return 0;