From nobody Fri Jun 17 19:29:05 2022 X-Original-To: dev-commits-src-branches@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 4EE8A8472F2; Fri, 17 Jun 2022 19:29:07 +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 4LPpxt0pG5z3GvK; Fri, 17 Jun 2022 19:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494146; 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=hC7I9M3cgRvma7Fog8vOE62T4F2e4y23g6JnhIwnE1s=; b=HuhhgA90LOnZFK22BC0fAdzjoG5+QmaLwG3h9u0GfgMs5cSGH4hms0TRe2Gjh5+PXxkOo/ 3OauG1mW38LXRD67ll4wgX5CbCawtmmtrxNmByXpVE2VG7iTpgc8c8DT77vNCZm+dd66El KLJppduo6Edok+W57fo2npC0RS+oJo4LH6qNeTAf78sHRfgoycMf65PAy8A1PeqiNQReA0 1b2ed67nHuVfzJcIhJ74Smjte+MZyf5hARv+bK/99jtNv+hYS5+fzm08dvk1T/cIOJzSiQ TljN+dHFeEiEaJSp+z/94VIOqzXhDECv+6jICCPex7oNkYjZlD+XOh8Y04htBQ== 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 964CC2579F; Fri, 17 Jun 2022 19:29:05 +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 25HJT5fv096938; Fri, 17 Jun 2022 19:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJT5Qc096937; Fri, 17 Jun 2022 19:29:05 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:29:05 GMT Message-Id: <202206171929.25HJT5Qc096937@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: e58a9a565f33 - stable/13 - Regen for ('0f8dab45404f347752470579feccc6d2739b9570') Linux rt_sigtimedwait system call. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e58a9a565f33f6054eb284a7a6d7c4fb1eae508e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494146; 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=hC7I9M3cgRvma7Fog8vOE62T4F2e4y23g6JnhIwnE1s=; b=u4pxah56xJaDf4Wes9is4V7klOkVeEXUCbGLgNAUceq7DyZD52P7P56It7zIKfMBMvvlgZ Un+rq4ZAA+0z9k79hjQn1NPF8GzYgrnIfmKOHNkMIO+P7LgORXfCOF5MCXy6d1u7ELg0H2 Zxkl+bzVnRTxgchcgeJ1zMUErxzcoUgN7azoMJiEWnZXiFEn0NHY9OCMw5+R7sBiBXwKKK 2Zr62GWfOrEaKThDt55PEuRrmAOi6tlSV+Y7r9hP2IiDV2JuMt3Es+y9NoMlH2H1o75DJE bSTrw1S7z4EPGJT1L3hPkfBBGlMuDZzhqM2SLGzb1XoGKhSEr3zXFZXOGrljMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494146; a=rsa-sha256; cv=none; b=gaNgyXJgCeJ64KGiit7ZAJn+4CXlDiNQX0hZo6OpSZ9UTnNbnO9Lw1twHKZiGrVKMVnWZx NgizS2COB7sWhRHVHn9eQxQ+KoRonMd5p4MWMQjf25UzVnCwynS0SBkOwCt16KRB+81BEK uK5Ni92v3fEam5LeEoJ/TtfTkZl1CYVZg6Y9or9BUI6iVYPSpDAxjYaYFfFoUhqu3IMra5 x1NB53FdWkSdmbLxy2JIQAts6msWAs1Am7ItM0/nSudw61DpTK5qWaZqHcka32dC0/rdJP xiAEKFbS3SwjAIHgaNUjNxcZSSzt8LVyv/sWWM0YF/Z5NoEmIz4Kn1KmQ31P9A== 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=e58a9a565f33f6054eb284a7a6d7c4fb1eae508e commit e58a9a565f33f6054eb284a7a6d7c4fb1eae508e Author: Dmitry Chagin AuthorDate: 2021-06-07 02:39:29 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:27:59 +0000 Regen for ('0f8dab45404f347752470579feccc6d2739b9570') Linux rt_sigtimedwait system call. MFC after: 2 weeks (cherry picked from commit e29ea22f7012bb94f5f427349aa4580539cf2b7c) --- sys/amd64/linux/linux_proto.h | 2 +- sys/amd64/linux/linux_systrace_args.c | 4 ++-- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- sys/arm/linux/linux_proto.h | 2 +- sys/arm/linux/linux_systrace_args.c | 4 ++-- sys/arm64/linux/linux_proto.h | 2 +- sys/arm64/linux/linux_systrace_args.c | 4 ++-- sys/i386/linux/linux_proto.h | 2 +- sys/i386/linux/linux_systrace_args.c | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index 5bd92a9ebf43..60e880d891e8 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -478,7 +478,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index da43328aad5a..d1f2f30f60e0 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -1070,7 +1070,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -4475,7 +4475,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 53218980b3f4..d8ac24f8492b 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -558,7 +558,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index bb29f8d0d3a5..9eb9bfc15390 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1207,7 +1207,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -5041,7 +5041,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; diff --git a/sys/arm/linux/linux_proto.h b/sys/arm/linux/linux_proto.h index 71225320bea1..e458adb30a10 100644 --- a/sys/arm/linux/linux_proto.h +++ b/sys/arm/linux/linux_proto.h @@ -463,7 +463,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/arm/linux/linux_systrace_args.c b/sys/arm/linux/linux_systrace_args.c index 2d5a8d2a9a74..608d8c1ed238 100644 --- a/sys/arm/linux/linux_systrace_args.c +++ b/sys/arm/linux/linux_systrace_args.c @@ -1050,7 +1050,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -4117,7 +4117,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index aa27a6246b6f..59904e0c2fe0 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -572,7 +572,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index fe4693ea3329..b8be9e91c823 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -1083,7 +1083,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -4144,7 +4144,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index e6f992539dc3..1b3512c5b890 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -559,7 +559,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 390b99e94052..b8e07e3cc985 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1250,7 +1250,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -5141,7 +5141,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t";