From 046ad632c8a3bba2329cf5e7f8f99f9992bbf14a Mon Sep 17 00:00:00 2001 From: Hiroshi Shimamoto Date: Tue, 25 Aug 2009 15:08:30 +0900 Subject: [PATCH] --- yaml --- r: 163078 b: refs/heads/master c: 36d47481b3824b661b464077db95d447984df799 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/time/timekeeping.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0c3ffeeaaf80..4ff1a2523a90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219 +refs/heads/master: 36d47481b3824b661b464077db95d447984df799 diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index 03cbeb34d141..fb0f46fa1ecd 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -826,9 +826,11 @@ void update_wall_time(void) */ void getboottime(struct timespec *ts) { - struct timespec boottime; + struct timespec boottime = { + .tv_sec = wall_to_monotonic.tv_sec + total_sleep_time.tv_sec, + .tv_nsec = wall_to_monotonic.tv_nsec + total_sleep_time.tv_nsec + }; - boottime = timespec_add_safe(wall_to_monotonic, total_sleep_time); set_normalized_timespec(ts, -boottime.tv_sec, -boottime.tv_nsec); }