diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hrtimer.h | 2 | ||||
-rw-r--r-- | include/linux/ktime.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index abb674c9b764..98c5c1537b5d 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -85,7 +85,7 @@ struct hrtimer_base { | |||
85 | spinlock_t lock; | 85 | spinlock_t lock; |
86 | struct rb_root active; | 86 | struct rb_root active; |
87 | struct rb_node *first; | 87 | struct rb_node *first; |
88 | unsigned long resolution; | 88 | ktime_t resolution; |
89 | ktime_t (*get_time)(void); | 89 | ktime_t (*get_time)(void); |
90 | struct hrtimer *curr_timer; | 90 | struct hrtimer *curr_timer; |
91 | }; | 91 | }; |
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index 222a047cc145..1bd6552cc341 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) | |||
272 | * idea of the (in)accuracy of timers. Timer values are rounded up to | 272 | * idea of the (in)accuracy of timers. Timer values are rounded up to |
273 | * this resolution values. | 273 | * this resolution values. |
274 | */ | 274 | */ |
275 | #define KTIME_REALTIME_RES (NSEC_PER_SEC/HZ) | 275 | #define KTIME_REALTIME_RES (ktime_t){ .tv64 = TICK_NSEC } |
276 | #define KTIME_MONOTONIC_RES (NSEC_PER_SEC/HZ) | 276 | #define KTIME_MONOTONIC_RES (ktime_t){ .tv64 = TICK_NSEC } |
277 | 277 | ||
278 | /* Get the monotonic time in timespec format: */ | 278 | /* Get the monotonic time in timespec format: */ |
279 | extern void ktime_get_ts(struct timespec *ts); | 279 | extern void ktime_get_ts(struct timespec *ts); |