Merge tag 'sound-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / kernel / time / time.c

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 58e312e..704ccd9 100644 (file)
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -179,7 +179,7 @@ int do_sys_settimeofday64(const struct timespec64 *tv, const struct timezone *tz
                return error;
 
        if (tz) {
-               /* Verify we're witin the +-15 hrs range */
+               /* Verify we're within the +-15 hrs range */
                if (tz->tz_minuteswest > 15*60 || tz->tz_minuteswest < -15*60)
                        return -EINVAL;
 
@@ -548,18 +548,21 @@ EXPORT_SYMBOL(set_normalized_timespec64);
  */
 struct timespec64 ns_to_timespec64(const s64 nsec)
 {
-       struct timespec64 ts;
+       struct timespec64 ts = { 0, 0 };
        s32 rem;
 
-       if (!nsec)
-               return (struct timespec64) {0, 0};
-
-       ts.tv_sec = div_s64_rem(nsec, NSEC_PER_SEC, &rem);
-       if (unlikely(rem < 0)) {
-               ts.tv_sec--;
-               rem += NSEC_PER_SEC;
+       if (likely(nsec > 0)) {
+               ts.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
+               ts.tv_nsec = rem;
+       } else if (nsec < 0) {
+               /*
+                * With negative times, tv_sec points to the earlier
+                * second, and tv_nsec counts the nanoseconds since
+                * then, so tv_nsec is always a positive number.
+                */
+               ts.tv_sec = -div_u64_rem(-nsec - 1, NSEC_PER_SEC, &rem) - 1;
+               ts.tv_nsec = NSEC_PER_SEC - rem - 1;
        }
-       ts.tv_nsec = rem;
 
        return ts;
 }
@@ -878,10 +881,11 @@ int get_timespec64(struct timespec64 *ts,
 
        ts->tv_sec = kts.tv_sec;
 
-       /* Zero out the padding for 32 bit systems or in compat mode */
+       /* Zero out the padding in compat mode */
        if (in_compat_syscall())
                kts.tv_nsec &= 0xFFFFFFFFUL;
 
+       /* In 32-bit mode, this drops the padding */
        ts->tv_nsec = kts.tv_nsec;
 
        return 0;