diff options
author | John Stultz <john.stultz@linaro.org> | 2011-02-14 20:52:09 -0500 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-02-21 15:53:05 -0500 |
commit | abb3a4ea2e0ea7114a4475745da2f32bd9ad5b73 (patch) | |
tree | ba78d928a1b58faf16c2507777b8430d54666f52 /include | |
parent | e06383db9ec591696a06654257474b85bac1f8cb (diff) |
time: Introduce get_monotonic_boottime and ktime_get_boottime
This adds new functions that return the monotonic time since boot
(in other words, CLOCK_MONOTONIC + suspend time).
CC: Jamie Lokier <jamie@shareable.org>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Alexander Shishkin <virtuoso@slind.org>
CC: Arve Hjønnevåg <arve@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hrtimer.h | 1 | ||||
-rw-r--r-- | include/linux/time.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 20b8e6601a04..7a9e7ee0f35c 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -312,6 +312,7 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer) | |||
312 | 312 | ||
313 | extern ktime_t ktime_get(void); | 313 | extern ktime_t ktime_get(void); |
314 | extern ktime_t ktime_get_real(void); | 314 | extern ktime_t ktime_get_real(void); |
315 | extern ktime_t ktime_get_boottime(void); | ||
315 | 316 | ||
316 | 317 | ||
317 | DECLARE_PER_CPU(struct tick_device, tick_cpu_device); | 318 | DECLARE_PER_CPU(struct tick_device, tick_cpu_device); |
diff --git a/include/linux/time.h b/include/linux/time.h index 379b9037b5b4..fa39150cb816 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -161,6 +161,7 @@ extern void getnstime_raw_and_real(struct timespec *ts_raw, | |||
161 | struct timespec *ts_real); | 161 | struct timespec *ts_real); |
162 | extern void getboottime(struct timespec *ts); | 162 | extern void getboottime(struct timespec *ts); |
163 | extern void monotonic_to_bootbased(struct timespec *ts); | 163 | extern void monotonic_to_bootbased(struct timespec *ts); |
164 | extern void get_monotonic_boottime(struct timespec *ts); | ||
164 | 165 | ||
165 | extern struct timespec timespec_trunc(struct timespec t, unsigned gran); | 166 | extern struct timespec timespec_trunc(struct timespec t, unsigned gran); |
166 | extern int timekeeping_valid_for_hres(void); | 167 | extern int timekeeping_valid_for_hres(void); |