From nobody Fri Feb 18 14:52:27 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 45EB019D7258; Fri, 18 Feb 2022 14:52:30 +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 4K0ZRc0pn4z3FZw; Fri, 18 Feb 2022 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645195949; 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=krAbBmqFN/tfkIjxdNbLoBwDoLUpKGUmiEgYmifgXxo=; b=DpO934wgIN+EMDdfAwrU3cbjQxgCva4FLRqhXhyq+x7Q9rNU624CHIoHxFpKhCB4C49bIG qeuOGko1Yz6XrDNullZ0GdZ+/MxSWqUrdhy5DOOmWnm7Lxo3ju1XFqX0UZKosSimnlVRUy VX+/S+CyJQt4FfcPZMUu/eQCIIOYMqfleIVYUMnHMt2jQmTpwtarl7USBsuvMyHOTBs4xm G49T2EG9C1jJBdUFHPxwDpTv5BIJegy44jZPCuh6eamanc8SA6zj21fVQFbd92lr10ZQwk vMEZ/xGSe1r5s+SzslpNARIzoJGl310rX/AzMuYInLCIH20jeNhnxkBAgEqm1g== 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 E26A51F896; Fri, 18 Feb 2022 14:52:27 +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 21IEqR2f077538; Fri, 18 Feb 2022 14:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IEqRhe077537; Fri, 18 Feb 2022 14:52:27 GMT (envelope-from git) Date: Fri, 18 Feb 2022 14:52:27 GMT Message-Id: <202202181452.21IEqRhe077537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: dfd9bcf077ae - stable/13 - Regen after 2561da0636c. 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dfd9bcf077ae4cb82a48643550fe1e142b444a05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645195949; 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=krAbBmqFN/tfkIjxdNbLoBwDoLUpKGUmiEgYmifgXxo=; b=cBKFU1nAONd0+JUtnKOck5eawE4M+r5hLZ+aD1+VHhKJ19tD93HKdpZgH65auoVvjG+o8o hFYf9gbFKs4AloiuWX2RtbEyHctMiKeQVd80SdSUX9tzKnzsPHuUyrK0TP9hOAV6dNVW7d d9vIZapFzlE3tcNR+T/ms2neQuW/aM6qOyERm/eKztoBrxg9Mnd2CzU4aocpgcsBcUEBUg vB4E9rlqUn2tZ/vnhFDFnba1e76QBQAD6FJwOgrIIfvTtJD2NDv3Re+NEeAnkfE8zSymwa Q0YHLxmtMeA7+c3gR+CnhPFwJkpn8v0Pw7txNuk8bZ+ImfBibMS/W+E4WrwxdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645195949; a=rsa-sha256; cv=none; b=KhFyfkSEaQ/qghREF6Ubz/vdP13xNYZlWr+06ziSsIdGciqcm3NHJRTZZPKkXH+l83Epl7 JgnMqDZvMJo3z7MOWluBT/SlEvf3JUzMxHjFQpqsMx8PLsDeuYTVAg+0k4YcivVBKJ+gpk v0Fl5v4FlmbBq0A/47rRZ4lSx5c/67bjwEitwgEl5l0rqq9xU/eewQp+OGxbNm9xiZBCeY lbPBGJ5Bl/qk/kGgk2Y/qM8UT8zcjXovpVp83Bb6qly600fUMI86WRyR2hVUiSzu8uWoMk Vm4vOI8t2rE4374yYz5SOyADk81HZBEHR2CeZcyJ2v1sGqDemleyx0azSxWXVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=dfd9bcf077ae4cb82a48643550fe1e142b444a05 commit dfd9bcf077ae4cb82a48643550fe1e142b444a05 Author: Edward Tomasz Napierala AuthorDate: 2021-07-21 12:26:31 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-14 18:43:29 +0000 Regen after 2561da0636c. (cherry picked from commit 8bc3dc01005e56035be8807d2a559c1a86960519) --- sys/arm64/linux/linux_proto.h | 2 +- sys/arm64/linux/linux_sysent.c | 2 +- sys/arm64/linux/linux_systrace_args.c | 14 +------------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index 8953a9d71401..aa27a6246b6f 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -581,7 +581,7 @@ struct linux_rt_sigqueueinfo_args { char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)]; }; struct linux_rt_sigreturn_args { - char ucp_l_[PADL_(struct l_ucontext *)]; struct l_ucontext * ucp; char ucp_r_[PADR_(struct l_ucontext *)]; + register_t dummy; }; struct linux_getpriority_args { char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)]; diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c index 03fb3e7343d3..2943071d4e1f 100644 --- a/sys/arm64/linux/linux_sysent.c +++ b/sys/arm64/linux/linux_sysent.c @@ -156,7 +156,7 @@ struct sysent linux_sysent[] = { { .sy_narg = AS(linux_rt_sigpending_args), .sy_call = (sy_call_t *)linux_rt_sigpending, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 136 = linux_rt_sigpending */ { .sy_narg = AS(linux_rt_sigtimedwait_args), .sy_call = (sy_call_t *)linux_rt_sigtimedwait, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 137 = linux_rt_sigtimedwait */ { .sy_narg = AS(linux_rt_sigqueueinfo_args), .sy_call = (sy_call_t *)linux_rt_sigqueueinfo, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 138 = linux_rt_sigqueueinfo */ - { .sy_narg = AS(linux_rt_sigreturn_args), .sy_call = (sy_call_t *)linux_rt_sigreturn, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 139 = linux_rt_sigreturn */ + { .sy_narg = 0, .sy_call = (sy_call_t *)linux_rt_sigreturn, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 139 = linux_rt_sigreturn */ { .sy_narg = AS(setpriority_args), .sy_call = (sy_call_t *)sys_setpriority, .sy_auevent = AUE_SETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 140 = setpriority */ { .sy_narg = AS(linux_getpriority_args), .sy_call = (sy_call_t *)linux_getpriority, .sy_auevent = AUE_GETPRIORITY, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 141 = linux_getpriority */ { .sy_narg = AS(linux_reboot_args), .sy_call = (sy_call_t *)linux_reboot, .sy_auevent = AUE_REBOOT, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 142 = linux_reboot */ diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 7edf41dbcdc4..fe4693ea3329 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -1099,9 +1099,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_rt_sigreturn */ case 139: { - struct linux_rt_sigreturn_args *p = params; - uarg[0] = (intptr_t)p->ucp; /* struct l_ucontext * */ - *n_args = 1; + *n_args = 0; break; } /* setpriority */ @@ -4173,13 +4171,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_rt_sigreturn */ case 139: - switch (ndx) { - case 0: - p = "userland struct l_ucontext *"; - break; - default: - break; - }; break; /* setpriority */ case 140: @@ -6727,9 +6718,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_rt_sigreturn */ case 139: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* setpriority */ case 140: if (ndx == 0 || ndx == 1)