From nobody Fri Jun 17 19:40:16 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 3384585CEA1; Fri, 17 Jun 2022 19:40:19 +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 4LPqBp0VDJz3hC9; Fri, 17 Jun 2022 19:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494818; 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=H3uV3frpt305081kvWBdyTkLApWBNhDMBNat6juWuxw=; b=QfBzk1betqHNyKAsRwB5ieWB6Q5gs5zo9d3Pv1i6g2PuQyFJm01+L2WI6cSzxsOsqBirQK 3Cd0r/af7b4LXbldF4hgHXw4eMU3vOrdU+YreJ55T+N2cSz4aD2x4avQq/8yMRiE60x7Vn krDxd1b5SY1lPzz5jf3hPkE0iYZNBTbMQ/sOGQg7+s5VjyBntNv7APBvyVuDM2bm30Yh6C sX0ZZxTWkqHmLnYhCewSKjM7s/k9QpsJ2x4IKKTA0LtAFE+NeszrV4/3iFL4TWArXBoaAJ 9fRl33wibmQu3AAift4zNstnsZPBr3EYU9MVlXVdoonk/8sG2eRJE9yBnI6yRA== 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 E13D025AE8; Fri, 17 Jun 2022 19:40:16 +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 25HJeGqb023119; Fri, 17 Jun 2022 19:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJeG8q023116; Fri, 17 Jun 2022 19:40:16 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:16 GMT Message-Id: <202206171940.25HJeG8q023116@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: c8a5bcdb11d3 - stable/13 - linux(4): Fix 039e98e6. 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: c8a5bcdb11d35997ea44a3c831c69119d4bd9a37 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494818; 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=H3uV3frpt305081kvWBdyTkLApWBNhDMBNat6juWuxw=; b=nssXKMcguAcummfp+ghwkMXgQ0tjXuaB6a6ZnPii739pu2RQAg1Fs62UUg6dNc3QgY/+Ow +TF7ijx3wHq3ZiO+oucgqnHYa9w8j+qq+rzVosOjfaJLVwcDApr/1cZuT59q+L333dkvVY IyLjsWmA7aOtRRDCOI1Nq/Dv7tSxr9NTuTLDoK7mY3VV1bEGhfiDtT+8/45et2euWmTZ6c 8wwQC2EAkkXrGMyq0/vLadX6MsU4a1YAKjAo92vaHD3fDFtSXSNRMhUWyz9M4OIZWTHS2/ 8m4BFmHP6GcDBLUDaxbRhgb+U9YNsY8AeVUK3CAJ32lvmY9OUYmyXvhNxDamnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494818; a=rsa-sha256; cv=none; b=BmxiiMn7c9uZLObkTqlUoJVS4+uzSZbrQ1A2iV6Dohk8lnWz1xVThiLHa4ga5RqjE45NH0 o2bwZ6nSUPyCoc5L1fQhogCZq2q9JQQ8w1hXh11Uvsenfz1OFP0zhbklQzWzeJwToeBfAS IZORKq296C10VM5qxsVD8Quj/IHBebOHrSrw6LpvYQjswQPwCoiaUHuKpCmGheqj+XY0Ir wpx+/1RTZ5xIByUXNs+vMBDDtyxW9z25CA7ikcA+5kgflRBHB6p91Gz8wfYvt6T58QOyFD Sve8PVezsAZXhhwnknHTy31ysDfvbFjr5TXbl0DmGMyqqRA1KbxlWgK8wTlBRA== 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=c8a5bcdb11d35997ea44a3c831c69119d4bd9a37 commit c8a5bcdb11d35997ea44a3c831c69119d4bd9a37 Author: Dmitry Chagin AuthorDate: 2022-05-09 18:45:51 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:07 +0000 linux(4): Fix 039e98e6. The patch was about an year in my local queue and I still screwed up... MFC after: 2 weeks (cherry picked from commit bfae7fbaa2af43800589b666ac45897d513f4482) --- sys/amd64/linux32/syscalls.master | 2 +- sys/i386/linux/syscalls.master | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 3d34610e2dcb..935f44d5b34f 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -913,7 +913,7 @@ int linux_prctl( l_int option, l_uintptr_t arg2, - l_ulntptr_t arg3, + l_uintptr_t arg3, l_uintptr_t arg4, l_uintptr_t arg5 ); diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index 8a47f70acaf5..d0e23e90cc38 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -938,7 +938,7 @@ int linux_prctl( l_int option, l_uintptr_t arg2, - l_ulntptr_t arg3, + l_uintptr_t arg3, l_uintptr_t arg4, l_uintptr_t arg5 );