From nobody Thu Jun 29 08:20:10 2023 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 4QsBG244d5z4knbk; Thu, 29 Jun 2023 08:20:10 +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 4QsBG23Bg3z3t7f; Thu, 29 Jun 2023 08:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026810; 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=PfUMA0AJd/7COcnJROC6hQI1hYe2bqxTUnz/EKUHU04=; b=eCMSrOIVV0jw4gRS+hkcWftdaQYWu8jlqRXORyB0AZeb1/NArEy/o4Ullr7U0k8rjL5zVD AzWOhCYHjK/msp3mnJ2cB7pk96TYgVX3c4svMRFrDBGa23eBmcYFvGhIOSkJfiDPrie2As S/yJmdotP5nS7M3Sy83paRh9TtL82IpV3jfZT3EZMcqfJNxJ9e4PotMRXUkVPQwHifri9G +jCtrYeI8qg/HV+wcGyfrn1GKVfoT+C4tUGuM5dWAPMHPpY+lYXRnNLLMjyO4R83g4q8lv 2YAIx9VEnTpzG9PwQaK1hklSZmnNBvpP2V2gOihX/N+mBqiDCmhu6vgwpioIBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026810; 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=PfUMA0AJd/7COcnJROC6hQI1hYe2bqxTUnz/EKUHU04=; b=aEHBXVHqC3skH0uF1hGnHFMX1o1bI7vA9YdAqLbxMq72Lw0TLYsiM6YWV4/hvi+tNX+5KN xm0+50EUuluJle/2tJ9rQbJPvCUnf0ROfnNSOVYW0h/XsMATq9dMt+HcdJ+Jm9r5ZQU5TJ SwFlkE8zf1/aKmpMPCu6jhgEAAwAll10SfqzR+ohrSbAST0Xusak6RoGHIbEN+nlYiXq/1 UqtImwvWOt7//m7+/wffu/XfAdHobepZhZqaECbX2cjomUJC6kk5+I7K+J/C+VCz7UVgNU lu0DRB56EaJMLeOQvn1xD9G8GNeFfXdOcTYipVkWW8cS5sKUDViNZA1RNUrDRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026810; a=rsa-sha256; cv=none; b=nNwddxSRXxhR9Fu182yUv9oGYNhLg4Naqw+aJGfPfapdrRmcBt0p0vj0H1c9/fBJuyDP21 0Zzbr7o0k6HGEQ+u+M0+ytTCBSXgW5usSpwI1AvY5HHXp0JK4Kf4OMPTiLeNxMq1Loy3fi yWvBzPtm5y9Vn5bhpt1IGCdJJb5F9zS5po2lp+l30R7+ry4+/hzAqtwvN5yrPSZkmuMOOa CH9CITMqpQccJTdnUX0aeqSvO8pYRexmYYD0D6D6fFoJc1t3HBWAdbYiPF+xHVxUyoT8hU OCRJ8tv/gVQB8PfnZJDmkeLbDiPPl3MjBFS+5w/RvIV6mbri7JdFpyyilTUrZA== 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 4QsBG21z1Sz17gh; Thu, 29 Jun 2023 08:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T8KAn9079070; Thu, 29 Jun 2023 08:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KA74079064; Thu, 29 Jun 2023 08:20:10 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:10 GMT Message-Id: <202306290820.35T8KA74079064@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: 276bc96ff331 - stable/13 - linux(4): Fix arm64 build after b7a6bcdd, missed chunk added 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: 276bc96ff331f3706b36b72e08f5c55f56784b46 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=276bc96ff331f3706b36b72e08f5c55f56784b46 commit 276bc96ff331f3706b36b72e08f5c55f56784b46 Author: Dmitry Chagin AuthorDate: 2023-04-22 22:41:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:28 +0000 linux(4): Fix arm64 build after b7a6bcdd, missed chunk added MFC after: 1 month (cherry picked from commit 66e8f1f7d37b5f657086437f5411a63c9080e25c) --- sys/compat/linux/linux_elf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_elf.c b/sys/compat/linux/linux_elf.c index 9db599d83bac..f335f18e252f 100644 --- a/sys/compat/linux/linux_elf.c +++ b/sys/compat/linux/linux_elf.c @@ -534,7 +534,8 @@ __linuxN(copyout_auxargs)(struct image_params *imgp, uintptr_t base) if (args->execfd != -1) AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd); if (p->p_osrel >= LINUX_KERNVER_5013000 || p->p_osrel == 0) - AUXARGS_ENTRY(pos, LINUX_AT_MINSIGSTKSZ, LINUX_MINSIGSTKSZ); + AUXARGS_ENTRY(pos, LINUX_AT_MINSIGSTKSZ, + imgp->sysent->sv_minsigstksz); AUXARGS_ENTRY(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP);