Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 370d303f146c388fba63bf08bd70c129 > files > 16

kernel-kerrighed-2.3.0-1mdv2009.0.src.rpm

From: Segher Boessenkool <segher@kernel.crashing.org>
Date: Tue, 4 Mar 2008 22:59:54 +0000 (-0800)
Subject: time: prevent the loop in timespec_add_ns() from being optimised away
X-Git-Tag: v2.6.25-rc5~2^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=38332cb98772f5ea757e6486bed7ed0381cb5f98

time: prevent the loop in timespec_add_ns() from being optimised away

Since some architectures don't support __udivdi3().

Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/linux/time.h b/include/linux/time.h
index 2091a19..d32ef0a 100644
--- a/include/linux/time.h
+++ b/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++;
 	}