---

yaml --- r: 19351 b: refs/heads/master c: 952bbc8 h: refs/heads/master i: 19349: 8c8db58 19347: eed07c6 19343: f18ea35 v: v3
git-mirror · Feb 1, 2006 · 2d41685 · 2d41685
1 parent 996207f
commit 2d41685
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66188fae3bf7f8dd951e2291d2a81888ed1b65de
+refs/heads/master: 952bbc87f01f552ef091a62ea2a721b5b2670e74
diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c
@@ -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;