Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ntp: Use ktime_get_ntp_seconds() 

Use ktime_get_ntp_seconds() to prepare for auxiliary clocks so that
the readout becomes per timekeeper.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250519083026.472512636@linutronix.de
This commit is contained in:
Thomas Gleixner 2025-05-19 10:33:31 +02:00
parent ffa0519baa
commit c85f5ab608
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/time/ntp.c
View File

@ -303,7 +303,7 @@ static void ntp_update_offset(struct ntp_data *ntpdata, long offset)
* Select how the frequency is to be controlled * Select how the frequency is to be controlled
* and in which mode (PLL or FLL). * and in which mode (PLL or FLL).
*/ */
real_secs = __ktime_get_real_seconds(); real_secs = ktime_get_ntp_seconds(ntpdata - tk_ntp_data);
secs = (long)(real_secs - ntpdata->time_reftime); secs = (long)(real_secs - ntpdata->time_reftime);
if (unlikely(ntpdata->time_status & STA_FREQHOLD)) if (unlikely(ntpdata->time_status & STA_FREQHOLD))
secs = 0; secs = 0;
@ -710,7 +710,7 @@ static inline void process_adj_status(struct ntp_data *ntpdata, const struct __k
* reference time to current time. * reference time to current time.
*/ */
if (!(ntpdata->time_status & STA_PLL) && (txc->status & STA_PLL)) if (!(ntpdata->time_status & STA_PLL) && (txc->status & STA_PLL))
ntpdata->time_reftime = __ktime_get_real_seconds(); ntpdata->time_reftime = ktime_get_ntp_seconds(ntpdata - tk_ntp_data);
/* only set allowed bits */ /* only set allowed bits */
ntpdata->time_status &= STA_RONLY; ntpdata->time_status &= STA_RONLY;