Brad Bishop | 977dc1a | 2019-02-06 16:01:43 -0500 | [diff] [blame] | 1 | Backport patch to fix systemd build failure on x32. |
| 2 | |
| 3 | Upstream-Status: Backport [https://github.com/systemd/systemd/commit/75ca162] |
| 4 | |
| 5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 6 | |
| 7 | From 75ca1621db4647a4d62d7873cd6715e28fe0f9fa Mon Sep 17 00:00:00 2001 |
| 8 | From: Yu Watanabe <watanabe.yu+github@gmail.com> |
| 9 | Date: Sat, 23 Jun 2018 09:41:55 +0900 |
| 10 | Subject: [PATCH] timesync: changes type of drift_freq to int64_t |
| 11 | |
| 12 | drift_freq is used for storing timex.freq, and is a 64bit integer. |
| 13 | To support x32 ABI, this changes the type of drift_freq to int64_t. |
| 14 | |
| 15 | Fixes #9387. |
| 16 | --- |
| 17 | src/timesync/timesyncd-manager.c | 2 +- |
| 18 | src/timesync/timesyncd-manager.h | 2 +- |
| 19 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 20 | |
| 21 | diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c |
| 22 | index 2b731af9e..404a2b189 100644 |
| 23 | --- a/src/timesync/timesyncd-manager.c |
| 24 | +++ b/src/timesync/timesyncd-manager.c |
| 25 | @@ -604,7 +604,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re |
| 26 | m->dest_time = *recv_time; |
| 27 | m->spike = spike; |
| 28 | |
| 29 | - log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRI_TIMEX"ppm%s", |
| 30 | + log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRIi64"ppm%s", |
| 31 | m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_freq / 65536, |
| 32 | spike ? " (ignored)" : ""); |
| 33 | |
| 34 | diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h |
| 35 | index d8d97cc1e..18347416d 100644 |
| 36 | --- a/src/timesync/timesyncd-manager.h |
| 37 | +++ b/src/timesync/timesyncd-manager.h |
| 38 | @@ -79,7 +79,7 @@ struct Manager { |
| 39 | /* last change */ |
| 40 | bool jumped; |
| 41 | bool sync; |
| 42 | - long drift_freq; |
| 43 | + int64_t drift_freq; |
| 44 | |
| 45 | /* watch for time changes */ |
| 46 | sd_event_source *event_clock_watch; |
| 47 | -- |
| 48 | 2.17.0 |
| 49 | |