diff options
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 177188b11a2e..274ed5e88456 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
| @@ -849,7 +849,7 @@ EXPORT_SYMBOL_GPL(ktime_get_real_seconds); | |||
| 849 | #ifdef CONFIG_NTP_PPS | 849 | #ifdef CONFIG_NTP_PPS |
| 850 | 850 | ||
| 851 | /** | 851 | /** |
| 852 | * getnstime_raw_and_real - get day and raw monotonic time in timespec format | 852 | * ktime_get_raw_and_real_ts64 - get day and raw monotonic time in timespec format |
| 853 | * @ts_raw: pointer to the timespec to be set to raw monotonic time | 853 | * @ts_raw: pointer to the timespec to be set to raw monotonic time |
| 854 | * @ts_real: pointer to the timespec to be set to the time of day | 854 | * @ts_real: pointer to the timespec to be set to the time of day |
| 855 | * | 855 | * |
| @@ -857,7 +857,7 @@ EXPORT_SYMBOL_GPL(ktime_get_real_seconds); | |||
| 857 | * same time atomically and stores the resulting timestamps in timespec | 857 | * same time atomically and stores the resulting timestamps in timespec |
| 858 | * format. | 858 | * format. |
| 859 | */ | 859 | */ |
| 860 | void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real) | 860 | void ktime_get_raw_and_real_ts64(struct timespec64 *ts_raw, struct timespec64 *ts_real) |
| 861 | { | 861 | { |
| 862 | struct timekeeper *tk = &tk_core.timekeeper; | 862 | struct timekeeper *tk = &tk_core.timekeeper; |
| 863 | unsigned long seq; | 863 | unsigned long seq; |
| @@ -868,7 +868,7 @@ void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real) | |||
| 868 | do { | 868 | do { |
| 869 | seq = read_seqcount_begin(&tk_core.seq); | 869 | seq = read_seqcount_begin(&tk_core.seq); |
| 870 | 870 | ||
| 871 | *ts_raw = timespec64_to_timespec(tk->raw_time); | 871 | *ts_raw = tk->raw_time; |
| 872 | ts_real->tv_sec = tk->xtime_sec; | 872 | ts_real->tv_sec = tk->xtime_sec; |
| 873 | ts_real->tv_nsec = 0; | 873 | ts_real->tv_nsec = 0; |
| 874 | 874 | ||
| @@ -877,10 +877,10 @@ void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real) | |||
| 877 | 877 | ||
| 878 | } while (read_seqcount_retry(&tk_core.seq, seq)); | 878 | } while (read_seqcount_retry(&tk_core.seq, seq)); |
| 879 | 879 | ||
| 880 | timespec_add_ns(ts_raw, nsecs_raw); | 880 | timespec64_add_ns(ts_raw, nsecs_raw); |
| 881 | timespec_add_ns(ts_real, nsecs_real); | 881 | timespec64_add_ns(ts_real, nsecs_real); |
| 882 | } | 882 | } |
| 883 | EXPORT_SYMBOL(getnstime_raw_and_real); | 883 | EXPORT_SYMBOL(ktime_get_raw_and_real_ts64); |
| 884 | 884 | ||
| 885 | #endif /* CONFIG_NTP_PPS */ | 885 | #endif /* CONFIG_NTP_PPS */ |
| 886 | 886 | ||
