Commit 51fe6a2b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

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

parent 0230f93d
...@@ -98,11 +98,14 @@ set_normalized_timespec (struct timespec *ts, time_t sec, long nsec) ...@@ -98,11 +98,14 @@ set_normalized_timespec (struct timespec *ts, time_t sec, long nsec)
ts->tv_nsec = nsec; ts->tv_nsec = nsec;
} }
void int
do_settimeofday (struct timeval *tv) do_settimeofday (struct timespec *tv)
{ {
time_t wtm_sec, sec = tv->tv_sec; time_t wtm_sec, sec = tv->tv_sec;
long wtm_nsec, nsec = tv->tv_usec * 1000; long wtm_nsec, nsec = tv->tv_nsec;
if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
return -EINVAL;
write_seqlock_irq(&xtime_lock); write_seqlock_irq(&xtime_lock);
{ {
...@@ -127,6 +130,7 @@ do_settimeofday (struct timeval *tv) ...@@ -127,6 +130,7 @@ do_settimeofday (struct timeval *tv)
} }
write_sequnlock_irq(&xtime_lock); write_sequnlock_irq(&xtime_lock);
clock_was_set(); clock_was_set();
return 0;
} }
void void
...@@ -134,6 +138,9 @@ do_gettimeofday (struct timeval *tv) ...@@ -134,6 +138,9 @@ do_gettimeofday (struct timeval *tv)
{ {
unsigned long seq, nsec, usec, sec, old, offset; unsigned long seq, nsec, usec, sec, old, offset;
if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
return -EINVAL;
while (1) { while (1) {
seq = read_seqbegin(&xtime_lock); seq = read_seqbegin(&xtime_lock);
{ {
......
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