Commit 3278b3b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Ingo Molnar:
 "Fix integer truncation bug in __do_adjtimex()"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ntp/y2038: Remove incorrect time_t truncation
parents 5ffaf037 2f584134

kernel/time/ntp.c

+1 −1
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts, 
	/* fill PPS status fields */

	pps_fill_timex(txc);



	txc->time.tv_sec = (time_t)ts->tv_sec;

	txc->time.tv_sec = ts->tv_sec;

	txc->time.tv_usec = ts->tv_nsec;

	if (!(time_status & STA_NANO))

		txc->time.tv_usec = ts->tv_nsec / NSEC_PER_USEC;