diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 10:44:50 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 10:44:50 +0200 |
| commit | 18a56c57bb42bf77fbe121fb7d33a66ac0a5e22a (patch) | |
| tree | 32dd36c203a2a4d628c81a9a74ba9e36f321c52a /kernel | |
| parent | 3870bd1f430f1e9c0ef7959e8ee058f066328953 (diff) | |
| parent | e9babf3472a0bb1bf31f8a3df173d683a86d2da3 (diff) | |
| download | kernel_samsung_crespo-18a56c57bb42bf77fbe121fb7d33a66ac0a5e22a.zip kernel_samsung_crespo-18a56c57bb42bf77fbe121fb7d33a66ac0a5e22a.tar.gz kernel_samsung_crespo-18a56c57bb42bf77fbe121fb7d33a66ac0a5e22a.tar.bz2 | |
Merge remote-tracking branch 'android/android-3.0' into HEAD
Diffstat (limited to 'kernel')
| -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 84d4f8b..5f00308 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1027,7 +1027,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); |