Commit 99f2577a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] s390: fix do_settimeofday() for new API

parent 9fb41ec2
...@@ -102,8 +102,10 @@ void do_gettimeofday(struct timeval *tv) ...@@ -102,8 +102,10 @@ void do_gettimeofday(struct timeval *tv)
tv->tv_usec = usec; tv->tv_usec = usec;
} }
void do_settimeofday(struct timeval *tv) int do_settimeofday(struct timespec *tv)
{ {
if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
return -EINVAL;
write_seqlock_irq(&xtime_lock); write_seqlock_irq(&xtime_lock);
/* This is revolting. We need to set the xtime.tv_nsec /* This is revolting. We need to set the xtime.tv_nsec
...@@ -112,20 +114,21 @@ void do_settimeofday(struct timeval *tv) ...@@ -112,20 +114,21 @@ void do_settimeofday(struct timeval *tv)
* Discover what correction gettimeofday * Discover what correction gettimeofday
* would have done, and then undo it! * would have done, and then undo it!
*/ */
tv->tv_usec -= do_gettimeoffset(); tv->tv_nsec -= do_gettimeoffset() * 1000;
while (tv->tv_usec < 0) { while (tv->tv_nsec < 0) {
tv->tv_usec += 1000000; tv->tv_nsec += NSEC_PER_SEC;
tv->tv_sec--; tv->tv_sec--;
} }
xtime.tv_sec = tv->tv_sec; xtime.tv_sec = tv->tv_sec;
xtime.tv_nsec = tv->tv_usec * 1000; xtime.tv_nsec = tv->tv_nsec;
time_adjust = 0; /* stop active adjtime() */ time_adjust = 0; /* stop active adjtime() */
time_status |= STA_UNSYNC; time_status |= STA_UNSYNC;
time_maxerror = NTP_PHASE_LIMIT; time_maxerror = NTP_PHASE_LIMIT;
time_esterror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT;
write_sequnlock_irq(&xtime_lock); write_sequnlock_irq(&xtime_lock);
return 0;
} }
#ifndef CONFIG_ARCH_S390X #ifndef CONFIG_ARCH_S390X
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment