diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-09-26 15:34:14 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-09-26 15:34:14 -0700 |
| commit | b6f6b769e3c69beb82c99ebd93354168de142dbe (patch) | |
| tree | 000f7d0d0eddd8a04558d3f84da02730d322e1b5 | |
| parent | e87dc13b1c3b4002e6f1efbe1538442a48fff6f0 (diff) | |
| parent | e9babf3472a0bb1bf31f8a3df173d683a86d2da3 (diff) | |
| download | kernel_samsung_tuna-b6f6b769e3c69beb82c99ebd93354168de142dbe.zip kernel_samsung_tuna-b6f6b769e3c69beb82c99ebd93354168de142dbe.tar.gz kernel_samsung_tuna-b6f6b769e3c69beb82c99ebd93354168de142dbe.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 9b28d04..06a5f31 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1002,7 +1002,7 @@ void get_monotonic_boottime(struct timespec *ts) } while (read_seqretry(&xtime_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); |