diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-02-28 11:25:22 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-02-28 11:25:22 -0600 |
| commit | 9585da3729e7e27bf22818625c10ac6c64ebb609 (patch) | |
| tree | 8c8d46f7f2cc933fdf75a6a75cf593a63f7b8717 /include/linux/ktime.h | |
| parent | 8080d5497146d5d27d9e8e78229d1adc7fe280cf (diff) | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| download | kernel_samsung_tuna-9585da3729e7e27bf22818625c10ac6c64ebb609.zip kernel_samsung_tuna-9585da3729e7e27bf22818625c10ac6c64ebb609.tar.gz kernel_samsung_tuna-9585da3729e7e27bf22818625c10ac6c64ebb609.tar.bz2 | |
Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'include/linux/ktime.h')
| -rw-r--r-- | include/linux/ktime.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index 6aca67a..f3dec45 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h @@ -96,10 +96,16 @@ static inline ktime_t ktime_set(const long secs, const unsigned long nsecs) ({ (ktime_t){ .tv64 = (kt).tv64 + (nsval) }; }) /* convert a timespec to ktime_t format: */ -#define timespec_to_ktime(ts) ktime_set((ts).tv_sec, (ts).tv_nsec) +static inline ktime_t timespec_to_ktime(struct timespec ts) +{ + return ktime_set(ts.tv_sec, ts.tv_nsec); +} /* convert a timeval to ktime_t format: */ -#define timeval_to_ktime(tv) ktime_set((tv).tv_sec, (tv).tv_usec * 1000) +static inline ktime_t timeval_to_ktime(struct timeval tv) +{ + return ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC); +} /* Map the ktime_t to timespec conversion to ns_to_timespec function */ #define ktime_to_timespec(kt) ns_to_timespec((kt).tv64) |