diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 10:22:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 10:22:11 -0800 |
| commit | 661dd5c840851194c7ee5a2603d5354dcf9bd212 (patch) | |
| tree | ae8698638f21deeca51c1522bb8ccfd6a7735770 /include/linux/ktime.h | |
| parent | 45bfe98bd790b5ded00462cd582effcfb42263cc (diff) | |
| parent | c9db4fa11526affde83603fe52595bd1260c1354 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/hrtimer-2.6
Diffstat (limited to 'include/linux/ktime.h')
| -rw-r--r-- | include/linux/ktime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index 222a047cc14..1bd6552cc34 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h @@ -272,8 +272,8 @@ static inline u64 ktime_to_ns(const ktime_t kt) * idea of the (in)accuracy of timers. Timer values are rounded up to * this resolution values. */ -#define KTIME_REALTIME_RES (NSEC_PER_SEC/HZ) -#define KTIME_MONOTONIC_RES (NSEC_PER_SEC/HZ) +#define KTIME_REALTIME_RES (ktime_t){ .tv64 = TICK_NSEC } +#define KTIME_MONOTONIC_RES (ktime_t){ .tv64 = TICK_NSEC } /* Get the monotonic time in timespec format: */ extern void ktime_get_ts(struct timespec *ts); |