diff options
| author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2009-08-25 15:08:30 +0900 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-25 09:09:02 +0200 |
| commit | 36d47481b3824b661b464077db95d447984df799 (patch) | |
| tree | 7ae9dc060872f879403e78ab1b1abd7f4ada4ed0 /kernel/time/timekeeping.c | |
| parent | 0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219 (diff) | |
| download | op-kernel-dev-36d47481b3824b661b464077db95d447984df799.zip op-kernel-dev-36d47481b3824b661b464077db95d447984df799.tar.gz | |
timekeeping: Fix invalid getboottime() value
Don't use timespec_add_safe() with wall_to_monotonic, because
wall_to_monotonic has negative values which will cause overflow
in timespec_add_safe(). That makes btime in /proc/stat invalid.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Daniel Walker <dwalker@fifo99.com>
LKML-Reference: <4A937FDE.4050506@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 03cbeb3..fb0f46f 100644 --- a/kernel/time/timekeeping.c +++ b/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); } |
