diff options
Diffstat (limited to 'include/linux/time.h')
-rw-r--r-- | include/linux/time.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index d32ef0ad4c0a..05f9517a8ed1 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -6,6 +6,7 @@ | |||
6 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
7 | # include <linux/cache.h> | 7 | # include <linux/cache.h> |
8 | # include <linux/seqlock.h> | 8 | # include <linux/seqlock.h> |
9 | # include <linux/math64.h> | ||
9 | #endif | 10 | #endif |
10 | 11 | ||
11 | #ifndef _STRUCT_TIMESPEC | 12 | #ifndef _STRUCT_TIMESPEC |
@@ -172,15 +173,7 @@ extern struct timeval ns_to_timeval(const s64 nsec); | |||
172 | */ | 173 | */ |
173 | static inline void timespec_add_ns(struct timespec *a, u64 ns) | 174 | static inline void timespec_add_ns(struct timespec *a, u64 ns) |
174 | { | 175 | { |
175 | ns += a->tv_nsec; | 176 | a->tv_sec += iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns); |
176 | while(unlikely(ns >= NSEC_PER_SEC)) { | ||
177 | /* The following asm() prevents the compiler from | ||
178 | * optimising this loop into a modulo operation. */ | ||
179 | asm("" : "+r"(ns)); | ||
180 | |||
181 | ns -= NSEC_PER_SEC; | ||
182 | a->tv_sec++; | ||
183 | } | ||
184 | a->tv_nsec = ns; | 177 | a->tv_nsec = ns; |
185 | } | 178 | } |
186 | #endif /* __KERNEL__ */ | 179 | #endif /* __KERNEL__ */ |