From nobody Fri Jun 17 19:32:17 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 7A380854424; Fri, 17 Jun 2022 19:32:18 +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 4LPq1Y5qYdz3KHr; Fri, 17 Jun 2022 19:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494338; 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=m8Dhc1QR/TdzIiuzEfPe15tJ1jgHlYeg/mH2cxWgk+c=; b=g9W70dzALZV7Gma3mH34SqBKNfmy7l/rod1S7uolXXAMr5yonsoKh38heh0B7qJOsj0DSy U/awIB6n+/EggN0d6IQreAaXvWPrLTNRJ0t21IBbzwszzsQTlQPUBKLpiq87Ig565sOzts remzMWjHcYhvSn4wJKzJzUEfkRLHgoidzOWjswo/fLOlv/JZ407yGDcU8vHgAm1OuKJFhu lq0e2EAEqV9DG3oPb6KyogGcKpj3G2zXGElzRTOfXAW1RlU7PwA7kWITm14INETTdGWMQY NfA9Jk12Yn328wob1hR6TdgmHyOQpc09U/ZOqJgNUHvWFq56zIZLCzuXMif3dw== 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 6485E25572; Fri, 17 Jun 2022 19:32:17 +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 25HJWHrM008263; Fri, 17 Jun 2022 19:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJWHU4008262; Fri, 17 Jun 2022 19:32:17 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:32:17 GMT Message-Id: <202206171932.25HJWHU4008262@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: cc22c0d6bbd9 - stable/13 - LinuxKPI: Put compat code under appropriate condition. 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: cc22c0d6bbd923f86a3a34a9cd8159a66e3ae730 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494338; 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=m8Dhc1QR/TdzIiuzEfPe15tJ1jgHlYeg/mH2cxWgk+c=; b=PX6+geMPhCPLBukB4B2SYQeg1O15O2TZBbBWVEchCeqkGLFWGFevurxmrdv+v6I2MQiuiL 9Psyr8P8uKftFxPYChyzrG7ZAvmSfnrtsvA73yRRm1YeHWqczeL6ji+cjhC0/Mj/25sUD1 iU53nUCx2Qb4e+ADmbqVmWAO/jwG5KYQgPMU2qCFySX7rjpxkPWdjCwLosfEF5rjHRRunp IDnhUHIzDtKI4UQQCPis4DqkY5TsXbYU7rRX/haEvJP3Z0TkUtNq0uhQJpNsd7RNN+Uzau DRLZn0RldsYoPmRgHsYT7pRTLmCd556K/xrH1cTSIDQH3IcLuPU8MobqFGw2xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494338; a=rsa-sha256; cv=none; b=R61wA+7p7s/H6GV8fV1Cllr5HeRmdxT5P5qy7prTTkf/3e6Jb53xBCCHUkZ31icc6xW0VR zv/fodh9fp4GPm9BvcrfXT0XoGOukAVjuykTQSRQCfJUV96KPZ6i7EVpv0bTHVwEM/rtMg nRbqwypIB91s5FvBd/fyV6DnYAT9sQRz2W3cKdyTCnt2K4bXWwgXnmBeWAXvqb26bxfVWz ucAF8g6hu2EQ+cNVrSO/5uUg/g7g2eH0yJSbj3jiUAdKp/1gEPynNsC7SHL6+Vel2uQaiZ +CgWJgZdUzWJ0Iw9F2PQY799apdrnoQ1CuOiIfov/7WEdrCdB753RwmE2ea0rA== 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=cc22c0d6bbd923f86a3a34a9cd8159a66e3ae730 commit cc22c0d6bbd923f86a3a34a9cd8159a66e3ae730 Author: Dmitry Chagin AuthorDate: 2021-06-29 17:19:17 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:30:28 +0000 LinuxKPI: Put compat code under appropriate condition. Reviewed by: hselasky, emaste, kib Differential Revision: https://reviews.freebsd.org/D30927 MFC after: 2 weeks (cherry picked from commit 1fd26da926d55bc0923b1218af65720dfaa4ca28) --- sys/compat/linuxkpi/common/src/linux_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index f3e018796249..4e98ed67e26d 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1096,7 +1096,7 @@ linux_file_ioctl_sub(struct file *fp, struct linux_file *filp, /* fetch user-space pointer */ data = *(void **)data; } -#if defined(__amd64__) +#ifdef COMPAT_FREEBSD32 if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { /* try the compat IOCTL handler first */ if (fop->compat_ioctl != NULL) {