Merge "timekeeping: fix 32-bit overflow in get_monotonic_boottime"

This commit is contained in:
Linux Build Service Account
2015-02-27 07:03:56 -08:00
committed by Gerrit - the friendly Code Review server
+1 -1
View File
@@ -1186,7 +1186,7 @@ void get_monotonic_boottime(struct timespec *ts)
} while (read_seqretry(&timekeeper.lock, seq));
set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec + sleep.tv_sec,
ts->tv_nsec + tomono.tv_nsec + sleep.tv_nsec + nsecs);
(s64)ts->tv_nsec + tomono.tv_nsec + sleep.tv_nsec + nsecs);
}
EXPORT_SYMBOL_GPL(get_monotonic_boottime);