git: 66e73ce7371b - main - linux(4): Fix clock_nanosleep return value for unsupported clockid.

Dmitry Chagin dchagin at FreeBSD.org
Sun Jun 6 15:23:13 UTC 2021


The branch main has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=66e73ce7371b717b8dd0dfd6e3deeacfa95e6f8b

commit 66e73ce7371b717b8dd0dfd6e3deeacfa95e6f8b
Author:     Dmitry Chagin <dchagin at FreeBSD.org>
AuthorDate: 2021-06-07 03:22:25 +0000
Commit:     Dmitry Chagin <dchagin at FreeBSD.org>
CommitDate: 2021-06-07 03:22:25 +0000

    linux(4): Fix clock_nanosleep return value for unsupported clockid.
    
    The Linux clock_nanosleep() returns ENOTSUP for CLOCK_THREAD_CPUTIME_ID.
    This silence one of the LTP clock_nanosleep tests.
    
    MFC after:      2 weeks
---
 sys/compat/linux/linux_time.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c
index 184de336fd99..c1644b5de939 100644
--- a/sys/compat/linux/linux_time.c
+++ b/sys/compat/linux/linux_time.c
@@ -701,6 +701,8 @@ linux_common_clock_nanosleep(struct thread *td, clockid_t which,
 		    unsupported_clockid, which);
 		return (error);
 	}
+	if (clockid == CLOCK_THREAD_CPUTIME_ID)
+		return (ENOTSUP);
 
 	return (kern_clock_nanosleep(td, clockid, flags, rqtp, rmtp));
 }


More information about the dev-commits-src-main mailing list