diff options
Diffstat (limited to 'kernel/time/ntp.c')
-rw-r--r-- | kernel/time/ntp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 33db43a39515..6e87df94122f 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
@@ -531,7 +531,7 @@ void ntp_notify_cmos_timer(void) { } | |||
531 | /* | 531 | /* |
532 | * Propagate a new txc->status value into the NTP state: | 532 | * Propagate a new txc->status value into the NTP state: |
533 | */ | 533 | */ |
534 | static inline void process_adj_status(struct timex *txc, struct timespec *ts) | 534 | static inline void process_adj_status(struct timex *txc, struct timespec64 *ts) |
535 | { | 535 | { |
536 | if ((time_status & STA_PLL) && !(txc->status & STA_PLL)) { | 536 | if ((time_status & STA_PLL) && !(txc->status & STA_PLL)) { |
537 | time_state = TIME_OK; | 537 | time_state = TIME_OK; |
@@ -554,7 +554,7 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts) | |||
554 | 554 | ||
555 | 555 | ||
556 | static inline void process_adjtimex_modes(struct timex *txc, | 556 | static inline void process_adjtimex_modes(struct timex *txc, |
557 | struct timespec *ts, | 557 | struct timespec64 *ts, |
558 | s32 *time_tai) | 558 | s32 *time_tai) |
559 | { | 559 | { |
560 | if (txc->modes & ADJ_STATUS) | 560 | if (txc->modes & ADJ_STATUS) |
@@ -640,7 +640,7 @@ int ntp_validate_timex(struct timex *txc) | |||
640 | * adjtimex mainly allows reading (and writing, if superuser) of | 640 | * adjtimex mainly allows reading (and writing, if superuser) of |
641 | * kernel time-keeping variables. used by xntpd. | 641 | * kernel time-keeping variables. used by xntpd. |
642 | */ | 642 | */ |
643 | int __do_adjtimex(struct timex *txc, struct timespec *ts, s32 *time_tai) | 643 | int __do_adjtimex(struct timex *txc, struct timespec64 *ts, s32 *time_tai) |
644 | { | 644 | { |
645 | int result; | 645 | int result; |
646 | 646 | ||
@@ -684,7 +684,7 @@ int __do_adjtimex(struct timex *txc, struct timespec *ts, s32 *time_tai) | |||
684 | /* fill PPS status fields */ | 684 | /* fill PPS status fields */ |
685 | pps_fill_timex(txc); | 685 | pps_fill_timex(txc); |
686 | 686 | ||
687 | txc->time.tv_sec = ts->tv_sec; | 687 | txc->time.tv_sec = (time_t)ts->tv_sec; |
688 | txc->time.tv_usec = ts->tv_nsec; | 688 | txc->time.tv_usec = ts->tv_nsec; |
689 | if (!(time_status & STA_NANO)) | 689 | if (!(time_status & STA_NANO)) |
690 | txc->time.tv_usec /= NSEC_PER_USEC; | 690 | txc->time.tv_usec /= NSEC_PER_USEC; |