| Message ID | 20230703-nolibc-ioperm-v1-1-abf9ebe98a80@weissschuh.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 67eb617a8e1e46ee726d0b2689dd459aab4e5e18 |
| Headers | show |
| Series | selftests/nolibc: simplify call to ioperm | expand |
On Mon, Jul 03, 2023 at 10:11:08AM +0200, Thomas Weißschuh wrote: > Since commit 53fcfafa8c5c ("tools/nolibc/unistd: add syscall()") nolibc > has support for syscall(2). > Use it to get rid of some ifdef-ery. Queued, thank you Thomas! Willy
diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 486334981e60..c02d89953679 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -1051,11 +1051,7 @@ int main(int argc, char **argv, char **envp) * exit with status code 2N+1 when N is written to 0x501. We * hard-code the syscall here as it's arch-dependent. */ -#if defined(_NOLIBC_SYS_H) - else if (my_syscall3(__NR_ioperm, 0x501, 1, 1) == 0) -#else - else if (ioperm(0x501, 1, 1) == 0) -#endif + else if (syscall(__NR_ioperm, 0x501, 1, 1) == 0) __asm__ volatile ("outb %%al, %%dx" :: "d"(0x501), "a"(0)); /* if it does nothing, fall back to the regular panic */ #endif
Since commit 53fcfafa8c5c ("tools/nolibc/unistd: add syscall()") nolibc has support for syscall(2). Use it to get rid of some ifdef-ery. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- tools/testing/selftests/nolibc/nolibc-test.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- base-commit: a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 change-id: 20230703-nolibc-ioperm-88d87ae6d5e9 Best regards,