From nobody Mon May 9 18:46:21 2022 X-Original-To: dev-commits-src-main@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 69C261AE73D5; Mon, 9 May 2022 18:46:21 +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 4KxqrY2TkHz3h9n; Mon, 9 May 2022 18:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652121981; 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=6aDZ4iex371tWTCBctWO7OLGH/orfg4PmA/iNAnHJ5o=; b=QNsaMxR41+h5wsgne43XtFfIVdwzEYGZUKlavXTrdKV96tqbcSxv/vYddmzw2hJphqhWk7 PDitMlRrozCX6kRbC3Zm+Fhpq3fC3b2zMFFRHvLXQXUaUumZZujyf3GqWTnQWeSBGY+dCi LTNT21ZlBJNOjNWyiBLM2Y3X0nOgs7FQ9EsH8/mYh3zsH+8iiGi4vn8Cz+N1fHJ1gKbGwD DFZNP75s2B4xZfSAgeDEknudyZqHUORwDwWZLMX+EPKry26YHV51+N7cxFj46QbDdQmSeC eiEAcHShoc/RTRlConfb5HrIYU4+NEus9LhlVIY0icpbNA7zbSvJd8Q9mtlbsw== 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 355F81613F; Mon, 9 May 2022 18:46:21 +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 249IkLTq030439; Mon, 9 May 2022 18:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249IkLK7030438; Mon, 9 May 2022 18:46:21 GMT (envelope-from git) Date: Mon, 9 May 2022 18:46:21 GMT Message-Id: <202205091846.249IkLK7030438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: bfae7fbaa2af - main - linux(4): Fix 039e98e6. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bfae7fbaa2af43800589b666ac45897d513f4482 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652121981; 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=6aDZ4iex371tWTCBctWO7OLGH/orfg4PmA/iNAnHJ5o=; b=oA65QDgAIFqUokl3jDtNis4bEuEVXqwrmuZVZLRdmK1vkwEoJGJS1mSVmJpVsd9rK50Azn jEDpNL+enwbtwu4HFSM13+9IZH10IXrUfe1DeF4nUtl9V5qro/360JkwQg6ZnFeDq5oijy xRkDQ7vC4Cyy00VnCD91RgFFmDXnYXKI1rLZEefiJlyklSe81YuJsODIxAudmwjKyU3aEk /ZKPpQCwy8JeClv09ka8OJKIkRBOeeREnanE+GA5Yx/n7VEUw2PkxxJ36uFxZnlmEqCwaE oPB76zbtTXqp1rnS2tzvR1hmC4kmQU0P5toBChqG2DQY0fZoy+B5gA7VJVQqGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652121981; a=rsa-sha256; cv=none; b=vkghJZrs+FaJKOG08eGeePMeZ+9VhiFYws/uq+7He2GO6Oj8sLpZVg/DHuGYw2/pCW3v5g OmiyZiXTgEA3Yu/02WsWTRZTqElfq08pjzIUcgNurcrtgLFrxWRHsWzezc3Is+NXul7dXs 9aPKxhLUbyepf2fcjejZbz7gwRH07RdkkdV9qLpuoj1FNL0kgadwYkR0mOvdA/cXBj4vwd UA7JUpcbG4MhIJxaXBnNU/rSwpZIOQRd33auUcGv9PeFfuip3OeRohrp2pOqSEzMFpft2d /qnTxHnqa5ozNIB1kuxgtcGszaEJzTg//gqMCwxtOKbyN7Au0jdhoJ2ZCNbgWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bfae7fbaa2af43800589b666ac45897d513f4482 commit bfae7fbaa2af43800589b666ac45897d513f4482 Author: Dmitry Chagin AuthorDate: 2022-05-09 18:45:51 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-09 18:45:51 +0000 linux(4): Fix 039e98e6. The patch was about an year in my local queue and I still screwed up... MFC after: 2 weeks --- 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 );