---

yaml --- r: 87064 b: refs/heads/master c: 38332cb h: refs/heads/master v: v3
git-mirror · Mar 9, 2008 · ad10112 · ad10112
1 parent 23bbe5d
commit ad10112
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e48af19f56eb47a1f908ee8f16df9d246f955b21
+refs/heads/master: 38332cb98772f5ea757e6486bed7ed0381cb5f98
diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h
@@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns)
 {
 	ns += a->tv_nsec;
 	while(unlikely(ns >= NSEC_PER_SEC)) {
+		/* The following asm() prevents the compiler from
+		 * optimising this loop into a modulo operation.  */
+		asm("" : "+r"(ns));
+
 		ns -= NSEC_PER_SEC;
 		a->tv_sec++;
 	}