diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2008-06-12 10:48:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-12 10:48:00 +0200 |
| commit | 9412e28649d0272df5e4af57bb378926fd4df580 (patch) | |
| tree | 3916d1b431723bc9231b41161d7a53aece02a3c3 /include | |
| parent | d5e181f78ac753893eb930868a52a4488cd3de0a (diff) | |
| download | linux-3.10-9412e28649d0272df5e4af57bb378926fd4df580.tar.gz linux-3.10-9412e28649d0272df5e4af57bb378926fd4df580.tar.bz2 linux-3.10-9412e28649d0272df5e4af57bb378926fd4df580.zip | |
always_inline timespec_add_ns
timespec_add_ns is used from the x86-64 vdso, which cannot call out to
other kernel code. Make sure that timespec_add_ns is always inlined
(and only uses always_inlined functions) to make sure there are no
unexpected calls.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/time.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 05f9517a8ed..e15206a7e82 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -170,10 +170,13 @@ extern struct timeval ns_to_timeval(const s64 nsec); * timespec_add_ns - Adds nanoseconds to a timespec * @a: pointer to timespec to be incremented * @ns: unsigned nanoseconds value to be added + * + * This must always be inlined because its used from the x86-64 vdso, + * which cannot call other kernel functions. */ -static inline void timespec_add_ns(struct timespec *a, u64 ns) +static __always_inline void timespec_add_ns(struct timespec *a, u64 ns) { - a->tv_sec += iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns); + a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns); a->tv_nsec = ns; } #endif /* __KERNEL__ */ |