From nobody Fri Jun 17 19:29:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 205DD8477E5; Fri, 17 Jun 2022 19:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPpxy2KfHz3Gvq; Fri, 17 Jun 2022 19:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uU1ExPu22Zt0FqR7CCFeB1B5UwbSDPLv+a9M+Xx7aco=; b=WrNyHu2ZRFlCQZ0kn1m1EICZssodYCJq2X1W4EZa38PwRib1hO+m2a8XrWseCqUlDKPMuv VxsnMZdQVpyIQseZZilXE6ZzkAiR1RJAf1ToTQ+fK5vP5JOBmApBz+tXm+WbQ/yygvYtO6 jKubwhEt/On0wIqfzTjqnt2kTAmlk6jko2XXvOwd1vYowStTyRw3JKxH+vP6RIuY/dPVNG szlmHoIBuILsCJM0Q52LbyunVFS+gUu2PdUkN1A1k3H1LhfH/46gwIRrAniBnZ4dKYP8Fy hYjlUOv0zbfcXq0kv2DLjeJy8j9D9YJxtnP8/64aH/y+OLsKqXS/GRGmnP0VCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18E6C25A03; Fri, 17 Jun 2022 19:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJT8Sg097016; Fri, 17 Jun 2022 19:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJT8AH097015; Fri, 17 Jun 2022 19:29:08 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:29:08 GMT Message-Id: <202206171929.25HJT8AH097015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 7f90bce85264 - stable/13 - linux(4): Fix clock_nanosleep return value for unsupported clockid. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f90bce852644e596e72ec2ce7a9125dbd151696 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uU1ExPu22Zt0FqR7CCFeB1B5UwbSDPLv+a9M+Xx7aco=; b=j01qccfC26huIHRRbjcYclWe8INF+Ocx5WpzqNm9EPY/lcAjrb2GeEbVzsPw9NFfchhLmz JWjs+J/+godfpTZzR0oeuucQJuvA9XTTR60VWDKdOVJI8edphoW5lgtC4zpRf7bTMx6pFq Im4TBmKH4xH3ciACToPFu2ARYzScwO8vdoslcPHCXhXitcjYO6HU/7RYIR0grL1BKo9D/h nic942T6dawK5IAQadlDzs/MOkZWFTq+aNQSt59qzMowSDJhDh4WER6HrHebb7ZpCHSJfZ fmBVEunr/GUxzCspyKJpqOdpohcYez/lsJoTy+5CHsHkfY27pLB6AWIiYNUsWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494150; a=rsa-sha256; cv=none; b=AEx2tgaYALBjU5gVEuNrOzJdxVH4v1XRG9L2wSEirol1Oimfgz5GL/Pp0gI4TCP/xqMwfs Jmi7PhTPS09xqeUEUzI6xfy484c61Q69/Vmcvr0YZx1SuRGGzepb+zhDvJvY2FhRAKRsy3 Loau5HzGVWy3JuCPXY91vkesY1CVmYvGEfgSsDG2HEeFmNr5VAl5M1GsZIsRdD8FQvhETS ooRsrN03VYKUKN01p36RD0G1DGbGOpPtVibdVvDzm7jTK4fbK7Us/fl+bvK8OomMI4+hl5 jPnrNpOlMMUasTUCgFbP0H13GE2n4BFkZ2XjQLptKigWnMrpZL3eHCqjdGzrvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7f90bce852644e596e72ec2ce7a9125dbd151696 commit 7f90bce852644e596e72ec2ce7a9125dbd151696 Author: Dmitry Chagin AuthorDate: 2021-06-07 03:22:25 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:28:01 +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 (cherry picked from commit 66e73ce7371b717b8dd0dfd6e3deeacfa95e6f8b) --- 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)); }