diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2026-06-30 15:55:43 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2026-06-30 15:55:43 +0300 |
| commit | 6d177908bad5992e17669030db41caab88041d5e (patch) | |
| tree | f63ef4b410e673db11865062558722c0d20b17b3 /include/linux/pps_kernel.h | |
| parent | c9ebe5d2f25729d6cfbbb1235d640bf67f9275df (diff) | |
| parent | dc59e4fea9d83f03bad6bddf3fa2e52491777482 (diff) | |
Merge drm/drm-next into drm-intel-next
Sync with v7.2-rc1.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/pps_kernel.h')
| -rw-r--r-- | include/linux/pps_kernel.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h index aab0aebb529e..9f088c9023b1 100644 --- a/include/linux/pps_kernel.h +++ b/include/linux/pps_kernel.h @@ -99,12 +99,14 @@ static inline void timespec_to_pps_ktime(struct pps_ktime *kt, static inline void pps_get_ts(struct pps_event_time *ts) { +#ifdef CONFIG_NTP_PPS struct system_time_snapshot snap; - ktime_get_snapshot(&snap); - ts->ts_real = ktime_to_timespec64(snap.real); -#ifdef CONFIG_NTP_PPS - ts->ts_raw = ktime_to_timespec64(snap.raw); + ktime_get_snapshot_id(CLOCK_REALTIME, &snap); + ts->ts_real = ktime_to_timespec64(snap.systime); + ts->ts_raw = ktime_to_timespec64(snap.monoraw); +#else + ktime_get_real_ts64(&ts->ts_real); #endif } |