diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-09 02:08:02 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-09 02:08:02 +0300 |
| commit | 4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15 (patch) | |
| tree | 7f162d0612f7048dc52a3ba320a6685593100729 /include/linux/pps_kernel.h | |
| parent | b318556479cc923970a79d6c2311138581c0db83 (diff) | |
| parent | 6c9d9c81924b4b63c7a487e90fddb3b2d0f7d458 (diff) | |
| download | linux-4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15.tar.xz | |
Merge branch 'pm-cpufreq-sched' into pm-cpufreq
Diffstat (limited to 'include/linux/pps_kernel.h')
| -rw-r--r-- | include/linux/pps_kernel.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h index 54bf1484d41f..35ac903956c7 100644 --- a/include/linux/pps_kernel.h +++ b/include/linux/pps_kernel.h @@ -111,22 +111,17 @@ static inline void timespec_to_pps_ktime(struct pps_ktime *kt, kt->nsec = ts.tv_nsec; } -#ifdef CONFIG_NTP_PPS - static inline void pps_get_ts(struct pps_event_time *ts) { - ktime_get_raw_and_real_ts64(&ts->ts_raw, &ts->ts_real); -} + struct system_time_snapshot snap; -#else /* CONFIG_NTP_PPS */ - -static inline void pps_get_ts(struct pps_event_time *ts) -{ - ktime_get_real_ts64(&ts->ts_real); + ktime_get_snapshot(&snap); + ts->ts_real = ktime_to_timespec64(snap.real); +#ifdef CONFIG_NTP_PPS + ts->ts_raw = ktime_to_timespec64(snap.raw); +#endif } -#endif /* CONFIG_NTP_PPS */ - /* Subtract known time delay from PPS event time(s) */ static inline void pps_sub_ts(struct pps_event_time *ts, struct timespec64 delta) { |