From 2280bba3074d082eee5283c00c07a52a9a53faa5 Mon Sep 17 00:00:00 2001
From: George Anzinger <george@mvista.com>
Date: Thu, 28 Jul 2005 21:16:16 -0700
Subject: [PATCH] --- yaml --- r: 5413 b: refs/heads/master c:
 78fa74a23b16bdb0d944272b696915c4e0bb3ee1 h: refs/heads/master i:   5411:
 a280f9dc468fce72ab1720c8c98063c3f3fb8599 v: v3

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

diff --git a/[refs] b/[refs]
index 220c9e1e590a..584ded5fc105 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2d76bd8fa29f9b6dbf3ee8f6bc7bdda21bc5ce8
+refs/heads/master: 78fa74a23b16bdb0d944272b696915c4e0bb3ee1
diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c
index 5b7b4736d82b..10b2ad749d14 100644
--- a/trunk/kernel/posix-timers.c
+++ b/trunk/kernel/posix-timers.c
@@ -896,21 +896,10 @@ static int adjust_abs_time(struct k_clock *clock, struct timespec *tp,
 			jiffies_64_f = get_jiffies_64();
 		}
 		/*
-		 * Take away now to get delta
+		 * Take away now to get delta and normalize
 		 */
-		oc.tv_sec -= now.tv_sec;
-		oc.tv_nsec -= now.tv_nsec;
-		/*
-		 * Normalize...
-		 */
-		while ((oc.tv_nsec - NSEC_PER_SEC) >= 0) {
-			oc.tv_nsec -= NSEC_PER_SEC;
-			oc.tv_sec++;
-		}
-		while ((oc.tv_nsec) < 0) {
-			oc.tv_nsec += NSEC_PER_SEC;
-			oc.tv_sec--;
-		}
+		set_normalized_timespec(&oc, oc.tv_sec - now.tv_sec,
+					oc.tv_nsec - now.tv_nsec);
 	}else{
 		jiffies_64_f = get_jiffies_64();
 	}