diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-09-26 15:35:26 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-09-26 15:35:26 -0700 |
| commit | 4ca3c11775b5eebc31183fc15252784c030bd140 (patch) | |
| tree | fac4fd17a6dc1bde13346ee3796a78a0fb8a4e9d | |
| parent | 0e8dcce2cdd2c5f3c295d5f046e90b63ada0d654 (diff) | |
| parent | b6f6b769e3c69beb82c99ebd93354168de142dbe (diff) | |
| download | kernel_samsung_tuna-4ca3c11775b5eebc31183fc15252784c030bd140.zip kernel_samsung_tuna-4ca3c11775b5eebc31183fc15252784c030bd140.tar.gz kernel_samsung_tuna-4ca3c11775b5eebc31183fc15252784c030bd140.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-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); |