tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 3278b3b6 5ffaf037

+1 -1
+1 -1
kernel/time/ntp.c
··· 771 771 /* fill PPS status fields */ 772 772 pps_fill_timex(txc); 773 773 774 - txc->time.tv_sec = (time_t)ts->tv_sec; 774 + txc->time.tv_sec = ts->tv_sec; 775 775 txc->time.tv_usec = ts->tv_nsec; 776 776 if (!(time_status & STA_NANO)) 777 777 txc->time.tv_usec = ts->tv_nsec / NSEC_PER_USEC;