diff options
-rw-r--r-- | meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 3 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch | 34 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 3f57ef3bf..889fe3e22 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | |||
@@ -12,6 +12,7 @@ SRC_URI:append:libc-musl = "\ | |||
12 | " | 12 | " |
13 | SRC_URI += "file://run-ptest \ | 13 | SRC_URI += "file://run-ptest \ |
14 | file://COPYING \ | 14 | file://COPYING \ |
15 | file://0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | # now we just test bpf and vm | 18 | # now we just test bpf and vm |
@@ -149,6 +150,8 @@ remove_unrelated() { | |||
149 | fi | 150 | fi |
150 | } | 151 | } |
151 | 152 | ||
153 | do_configure[dirs] = "${S}" | ||
154 | |||
152 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 155 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
153 | 156 | ||
154 | INHIBIT_PACKAGE_DEBUG_SPLIT="1" | 157 | INHIBIT_PACKAGE_DEBUG_SPLIT="1" |
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch new file mode 100644 index 000000000..bf5525c36 --- /dev/null +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 34021e84d03e2becb88e6c28e8e4867e82a81da5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 17 Sep 2024 17:40:03 -0700 | ||
4 | Subject: [PATCH] selftests: timers: Fix clock_adjtime for newer 32-bit arches | ||
5 | |||
6 | Newer 32-bit architectures e.g. riscv32 are using 64-bit time_t | ||
7 | from get go, they have not wired __NR_clock_adjtime at all | ||
8 | valid-adjtimex testcase fails to compile on such architectures. | ||
9 | if this condition is found then use 64-bit adjtime syscall | ||
10 | |||
11 | Upstream-Status: Submitted [https://patchwork.kernel.org/project/linux-kselftest/patch/20240918004731.3295870-1-raj.khem@gmail.com/] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | Cc: John Stultz <jstultz@google.com> | ||
14 | Cc: Shuah Khan <shuah@kernel.org> | ||
15 | --- | ||
16 | tools/testing/selftests/timers/valid-adjtimex.c | 4 ++++ | ||
17 | 1 file changed, 4 insertions(+) | ||
18 | |||
19 | diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c | ||
20 | index d500884801d8..ff4ff8b1d127 100644 | ||
21 | --- a/tools/testing/selftests/timers/valid-adjtimex.c | ||
22 | +++ b/tools/testing/selftests/timers/valid-adjtimex.c | ||
23 | @@ -39,7 +39,11 @@ | ||
24 | #include <sys/syscall.h> | ||
25 | int clock_adjtime(clockid_t id, struct timex *tx) | ||
26 | { | ||
27 | +#if !defined(__NR_clock_adjtime) && defined(__NR_clock_adjtime64) | ||
28 | + return syscall(__NR_clock_adjtime64, id, tx); | ||
29 | +#else | ||
30 | return syscall(__NR_clock_adjtime, id, tx); | ||
31 | +#endif | ||
32 | } | ||
33 | |||
34 | |||