From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH V4 5/6] syscalls: Don't pass struct timespec to tst_syscall()
Date: Fri, 3 Jul 2020 14:59:27 +0200 [thread overview]
Message-ID: <20200703125927.GA11556@yuki.lan> (raw)
In-Reply-To: <CAEemH2cu_o2eCHQB1_Bo0aQiR2WK6knbBtD83-5_77gZZbA-Ow@mail.gmail.com>
Hi!
I guess that we need:
diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c
index bc0bef273..c0727a34c 100644
--- a/lib/tst_clocks.c
+++ b/lib/tst_clocks.c
@@ -14,11 +14,11 @@
typedef int (*mysyscall)(clockid_t clk_id, void *ts);
-int syscall_supported_by_kernel(mysyscall func)
+int syscall_supported_by_kernel(long sysnr)
{
int ret;
- ret = func(0, NULL);
+ ret = syscall(sysnr, func(0, NULL);
if (ret == -1 && errno == ENOSYS)
return 0;
@@ -32,13 +32,13 @@ int tst_clock_getres(clockid_t clk_id, struct timespec *res)
int ret;
#if (__NR_clock_getres_time64 != __LTP__NR_INVALID_SYSCALL)
- if (!func && syscall_supported_by_kernel(sys_clock_getres64)) {
+ if (!func && syscall_supported_by_kernel(__NR_clock_getres64)) {
func = sys_clock_getres64;
tts.type = TST_KERN_TIMESPEC;
}
#endif
- if (!func && syscall_supported_by_kernel(sys_clock_getres)) {
+ if (!func && syscall_supported_by_kernel(__NR_clock_getres)) {
func = sys_clock_getres;
tts.type = TST_KERN_OLD_TIMESPEC;
}
@@ -62,13 +62,13 @@ int tst_clock_gettime(clockid_t clk_id, struct timespec *ts)
int ret;
#if (__NR_clock_gettime64 != __LTP__NR_INVALID_SYSCALL)
- if (!func && syscall_supported_by_kernel(sys_clock_gettime64)) {
+ if (!func && syscall_supported_by_kernel(__NR_clock_gettime64)) {
func = sys_clock_gettime64;
tts.type = TST_KERN_TIMESPEC;
}
#endif
- if (!func && syscall_supported_by_kernel(sys_clock_gettime)) {
+ if (!func && syscall_supported_by_kernel(__NR_clock_gettime)) {
func = sys_clock_gettime;
tts.type = TST_KERN_OLD_TIMESPEC;
}
@@ -91,13 +91,13 @@ int tst_clock_settime(clockid_t clk_id, struct timespec *ts)
static mysyscall func;
#if (__NR_clock_settime64 != __LTP__NR_INVALID_SYSCALL)
- if (!func && syscall_supported_by_kernel(sys_clock_settime64)) {
+ if (!func && syscall_supported_by_kernel(__NR_clock_settime64)) {
func = sys_clock_settime64;
tts.type = TST_KERN_TIMESPEC;
}
#endif
- if (!func && syscall_supported_by_kernel(sys_clock_settime)) {
+ if (!func && syscall_supported_by_kernel(__NR_clock_settime)) {
func = sys_clock_settime;
tts.type = TST_KERN_OLD_TIMESPEC;
}
--
Cyril Hrubis
chrubis@suse.cz
next prev parent reply other threads:[~2020-07-03 12:59 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 6:54 [LTP] [PATCH V2 0/6] syscalls: Remove incorrect usage of libc structures Viresh Kumar
2020-05-22 6:54 ` [LTP] [PATCH V2 1/6] tst_safe_clocks: Remove safe_clock_adjtime() Viresh Kumar
2020-05-22 6:54 ` [LTP] [PATCH V2 2/6] syscalls: settimeofday01: Set .restore_wallclock flag Viresh Kumar
2020-05-22 6:54 ` [LTP] [PATCH V2 3/6] syscalls: settimeofday02: Remove time restoration code Viresh Kumar
2020-05-22 6:54 ` [LTP] [PATCH V2 4/6] syscalls: settimeofday: Use gettimeofday() Viresh Kumar
2020-06-17 12:17 ` Cyril Hrubis
2020-05-22 6:54 ` [LTP] [PATCH V2 5/6] syscalls: Don't pass struct timespec to tst_syscall() Viresh Kumar
2020-05-22 8:02 ` Arnd Bergmann
2020-05-22 8:42 ` Viresh Kumar
2020-05-22 8:58 ` Cyril Hrubis
2020-06-17 12:22 ` Cyril Hrubis
2020-05-27 9:43 ` [LTP] [PATCH V3 " Viresh Kumar
2020-05-27 9:49 ` Arnd Bergmann
2020-06-17 12:30 ` Cyril Hrubis
2020-06-18 5:25 ` [LTP] [PATCH V4 " Viresh Kumar
2020-06-18 11:06 ` Cyril Hrubis
2020-07-03 9:55 ` Li Wang
2020-07-03 12:26 ` Harish
2020-07-03 12:59 ` Cyril Hrubis [this message]
2020-07-04 7:14 ` Li Wang
2020-07-06 8:44 ` Harish
2020-07-06 8:57 ` Li Wang
2020-07-06 9:21 ` Harish
2020-07-07 9:03 ` Cyril Hrubis
2020-07-07 9:18 ` Viresh Kumar
2020-07-07 11:49 ` Cyril Hrubis
2020-07-08 2:34 ` Viresh Kumar
2020-07-06 2:21 ` Viresh Kumar
2020-05-22 6:54 ` [LTP] [PATCH V2 6/6] syscalls: Don't pass struct timeval " Viresh Kumar
2020-06-17 14:08 ` Cyril Hrubis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200703125927.GA11556@yuki.lan \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox