diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 05:55:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 05:55:04 -0400 |
| commit | a0f0dd57f4a85310d9936f1770a0424b49fef876 (patch) | |
| tree | 2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b /include/linux/pps_kernel.h | |
| parent | 2a552d5e63d7fa602c9a9a0717008737f55625a6 (diff) | |
| parent | 846a136881b8f73c1f74250bf6acfaa309cab1f2 (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/kernel/smp.c
Diffstat (limited to 'include/linux/pps_kernel.h')
| -rw-r--r-- | include/linux/pps_kernel.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h index 94048547f29a..0cc45ae1afd5 100644 --- a/include/linux/pps_kernel.h +++ b/include/linux/pps_kernel.h | |||
| @@ -116,5 +116,14 @@ static inline void pps_get_ts(struct pps_event_time *ts) | |||
| 116 | 116 | ||
| 117 | #endif /* CONFIG_NTP_PPS */ | 117 | #endif /* CONFIG_NTP_PPS */ |
| 118 | 118 | ||
| 119 | /* Subtract known time delay from PPS event time(s) */ | ||
| 120 | static inline void pps_sub_ts(struct pps_event_time *ts, struct timespec delta) | ||
| 121 | { | ||
| 122 | ts->ts_real = timespec_sub(ts->ts_real, delta); | ||
| 123 | #ifdef CONFIG_NTP_PPS | ||
| 124 | ts->ts_raw = timespec_sub(ts->ts_raw, delta); | ||
| 125 | #endif | ||
| 126 | } | ||
| 127 | |||
| 119 | #endif /* LINUX_PPS_KERNEL_H */ | 128 | #endif /* LINUX_PPS_KERNEL_H */ |
| 120 | 129 | ||