| Andrew Geissler | c723b72 | 2021-01-08 16:14:09 -0600 | [diff] [blame] | 1 | From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001 |
| 2 | From: Pino Toscano <toscano.pino@tiscali.it> |
| 3 | Date: Tue, 17 Nov 2020 11:32:45 +0100 |
| 4 | Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32 |
| 5 | |
| 6 | Check that __NR_settimeofday_time32 exists before trying to use it as |
| 7 | syscall number. |
| 8 | |
| 9 | Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/367972fae13d170675768d63678577cae1890143] |
| 10 | Signed-off-by: Pino Toscano <toscano.pino@tiscali.it> |
| 11 | --- |
| 12 | sys-utils/hwclock.c | 2 +- |
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c |
| 16 | index 1f7ef3317..db448687d 100644 |
| 17 | --- a/sys-utils/hwclock.c |
| 18 | +++ b/sys-utils/hwclock.c |
| 19 | @@ -678,7 +678,7 @@ display_time(struct timeval hwctime) |
| 20 | #ifndef SYS_settimeofday |
| 21 | # ifdef __NR_settimeofday |
| 22 | # define SYS_settimeofday __NR_settimeofday |
| 23 | -# else |
| 24 | +# elif defined(__NR_settimeofday_time32) |
| 25 | # define SYS_settimeofday __NR_settimeofday_time32 |
| 26 | # endif |
| 27 | #endif |
| 28 | -- |
| 29 | 2.29.2 |
| 30 | |