From 2d41685f95bc3c34b27282d2c9759cefb509d4e9 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 1 Feb 2006 03:05:13 -0800
Subject: [PATCH] --- yaml --- r: 19351 b: refs/heads/master c:
 952bbc87f01f552ef091a62ea2a721b5b2670e74 h: refs/heads/master i:   19349:
 8c8db58820db47b3d62f84b34608e2e0b07de80e   19347:
 eed07c607f7ffcd6fc63903f6351a7b1b0ad4a3a   19343:
 f18ea3538a4184f4e6ba9a9157605ad4b67ec1ee v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/posix-timers.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2a576d118e1e..478d2df27592 100644
--- 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
index 28e72fd0029f..aad6f138d5c9 100644
--- 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;