From 647b60f67870d9cb99c7d1315eea2ebc8cec780f Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 14 Feb 2011 18:43:08 -0800 Subject: [PATCH] --- yaml --- r: 234623 b: refs/heads/master c: 314ac37150011ebb398f522db528d2dbcc611189 h: refs/heads/master i: 234621: f8bc2a9355064149745ca8991d51b4bc989c5674 234619: 9bdde7753df233fabf4ae26147a2ad503ba9c2b7 234615: 292e2ce7bcd600391710b24965a820f65aa35f89 234607: 918c432b2f8ec4ca598e35ef19a9133fd8bbd205 234591: 524915e9603969feb19dac669f3842597cb0ef10 234559: 79e9222c2b0feef7db28de6ec5ad75afbd32c03a 234495: 17e522513e3f851e47435721b330b74bd722ee84 v: v3 --- [refs] | 2 +- trunk/include/linux/time.h | 3 ++- trunk/kernel/hrtimer.c | 9 +++++---- trunk/kernel/time/timekeeping.c | 8 ++++++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 237db2fb063d..88e5a3ede14f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abb3a4ea2e0ea7114a4475745da2f32bd9ad5b73 +refs/heads/master: 314ac37150011ebb398f522db528d2dbcc611189 diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h index fa39150cb816..02d48fb30b41 100644 --- a/trunk/include/linux/time.h +++ b/trunk/include/linux/time.h @@ -124,7 +124,8 @@ unsigned long get_seconds(void); struct timespec current_kernel_time(void); struct timespec __current_kernel_time(void); /* does not take xtime_lock */ struct timespec get_monotonic_coarse(void); -void get_xtime_and_monotonic_offset(struct timespec *xtim, struct timespec *wtom); +void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim, + struct timespec *wtom, struct timespec *sleep); #define CURRENT_TIME (current_kernel_time()) #define CURRENT_TIME_SEC ((struct timespec) { get_seconds(), 0 }) diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index ca99e2454600..e8bf3ad99063 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -91,9 +91,9 @@ static inline int hrtimer_clockid_to_base(clockid_t clock_id) static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) { ktime_t xtim, tomono; - struct timespec xts, tom; + struct timespec xts, tom, slp; - get_xtime_and_monotonic_offset(&xts, &tom); + get_xtime_and_monotonic_and_sleep_offset(&xts, &tom, &slp); xtim = timespec_to_ktime(xts); tomono = timespec_to_ktime(tom); @@ -614,12 +614,13 @@ static int hrtimer_reprogram(struct hrtimer *timer, static void retrigger_next_event(void *arg) { struct hrtimer_cpu_base *base; - struct timespec realtime_offset, wtm; + struct timespec realtime_offset, wtm, sleep; if (!hrtimer_hres_active()) return; - get_xtime_and_monotonic_offset(&realtime_offset, &wtm); + get_xtime_and_monotonic_and_sleep_offset(&realtime_offset, &wtm, + &sleep); set_normalized_timespec(&realtime_offset, -wtm.tv_sec, -wtm.tv_nsec); base = &__get_cpu_var(hrtimer_bases); diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index 5fbd9aa7df95..3bd7e3d5c632 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -1040,11 +1040,14 @@ void do_timer(unsigned long ticks) } /** - * get_xtime_and_monotonic_offset() - get xtime and wall_to_monotonic + * get_xtime_and_monotonic_and_sleep_offset() - get xtime, wall_to_monotonic, + * and sleep offsets. * @xtim: pointer to timespec to be set with xtime * @wtom: pointer to timespec to be set with wall_to_monotonic + * @sleep: pointer to timespec to be set with time in suspend */ -void get_xtime_and_monotonic_offset(struct timespec *xtim, struct timespec *wtom) +void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim, + struct timespec *wtom, struct timespec *sleep) { unsigned long seq; @@ -1052,6 +1055,7 @@ void get_xtime_and_monotonic_offset(struct timespec *xtim, struct timespec *wtom seq = read_seqbegin(&xtime_lock); *xtim = xtime; *wtom = wall_to_monotonic; + *sleep = total_sleep_time; } while (read_seqretry(&xtime_lock, seq)); }