diff options
author | John Stultz <john.stultz@linaro.org> | 2011-02-14 21:43:08 -0500 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-02-21 15:53:07 -0500 |
commit | 314ac37150011ebb398f522db528d2dbcc611189 (patch) | |
tree | 0731fced7713d3889bd783577673068a6bc93796 /kernel/time | |
parent | abb3a4ea2e0ea7114a4475745da2f32bd9ad5b73 (diff) |
time: Extend get_xtime_and_monotonic_offset() to also return sleep
Extend get_xtime_and_monotonic_offset to
get_xtime_and_monotonic_and_sleep_offset().
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 'kernel/time')
-rw-r--r-- | kernel/time/timekeeping.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 5fbd9aa7df95..3bd7e3d5c632 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -1040,11 +1040,14 @@ void do_timer(unsigned long ticks) | |||
1040 | } | 1040 | } |
1041 | 1041 | ||
1042 | /** | 1042 | /** |
1043 | * get_xtime_and_monotonic_offset() - get xtime and wall_to_monotonic | 1043 | * get_xtime_and_monotonic_and_sleep_offset() - get xtime, wall_to_monotonic, |
1044 | * and sleep offsets. | ||
1044 | * @xtim: pointer to timespec to be set with xtime | 1045 | * @xtim: pointer to timespec to be set with xtime |
1045 | * @wtom: pointer to timespec to be set with wall_to_monotonic | 1046 | * @wtom: pointer to timespec to be set with wall_to_monotonic |
1047 | * @sleep: pointer to timespec to be set with time in suspend | ||
1046 | */ | 1048 | */ |
1047 | void get_xtime_and_monotonic_offset(struct timespec *xtim, struct timespec *wtom) | 1049 | void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim, |
1050 | struct timespec *wtom, struct timespec *sleep) | ||
1048 | { | 1051 | { |
1049 | unsigned long seq; | 1052 | unsigned long seq; |
1050 | 1053 | ||
@@ -1052,6 +1055,7 @@ void get_xtime_and_monotonic_offset(struct timespec *xtim, struct timespec *wtom | |||
1052 | seq = read_seqbegin(&xtime_lock); | 1055 | seq = read_seqbegin(&xtime_lock); |
1053 | *xtim = xtime; | 1056 | *xtim = xtime; |
1054 | *wtom = wall_to_monotonic; | 1057 | *wtom = wall_to_monotonic; |
1058 | *sleep = total_sleep_time; | ||
1055 | } while (read_seqretry(&xtime_lock, seq)); | 1059 | } while (read_seqretry(&xtime_lock, seq)); |
1056 | } | 1060 | } |
1057 | 1061 | ||