From nobody Fri Mar 31 11:57:10 2023 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 4PnzKy5y8Bz42NxX; Fri, 31 Mar 2023 11:57: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 4PnzKy5Qjrz3mRy; Fri, 31 Mar 2023 11:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680263830; 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=9wT8MM5rqocCKQ5mSvu8VNCttl1bpjYRFcs/i7kBkP4=; b=hm1MxJ0UFBrf9LrJpLG6dSjuP9eAd5eOeumfv1Fkv9d+/ryyX/UmqWfVQzcb1G2IjAE/0Z hPWC9BbsrvLGZkABr37d+aJE8pbVJBYUoSbpsZtGfqcQZil0oFuC+GsLMQSZBHcYSeMq77 XPM4hyx8SSewQJyKjbmdqDgILB5bWCN+YRacki8qs/ARtj6+Bh+xAvK3EGMjLP6C6EOA0I EcRADFLLWBC/Wgq9NOi8Q4+JkKLQ8VaXPB54yHS9BKyfHfeMPtraONQiUNxcj9wpbIdsxS dWnWzdrFhUEBNIX5iChTn7gM5HzNdBPzUD6/ZVW3e9nl8KhQqaS4gv0vkSopGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680263830; 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=9wT8MM5rqocCKQ5mSvu8VNCttl1bpjYRFcs/i7kBkP4=; b=hAmXwgMXoyPPV5BEcgOgJujD999U14mPrFDUuEl6tngMryd4sOihYRPcI87vBeASmZwbPT C3jUeTYVFlbi+Q277eBKPGz13fL+iJVjo/5Y3JXjg10NJYajgCUEMNUKirMr5/QnebCAMH zfOvuGHQ9ZipHJOQOh8KtRvvkYQjtPRR8erfJzK+7ZCshDLdekXvsSe9wu0ecyKZzPfZ6s GScMtdvauN2b1B8goNMWmLa0S1yUHeZ5Jg5KXhIzgijWPzDIlG9LnRvru4bGwSK97baV9y 02ktGJVPRGhIviUWuJ/5nAbooZL4hq3r/w8F+PzYVTied35tiBHDLb59waoEXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680263830; a=rsa-sha256; cv=none; b=IrO7Ds6oZx1aN3DWeAZwf6tPoos65CLizialAkfQ+54ZF5YJfZOzVWN+BEh6wo+RlFU+XW Dubq11VuUq4zP0IiFqX6+kZeH4wacM0OQZl+1lvCwTedrt/TJG6+75vA17vXhkO1ma55rj Yzhu+0D1AoNVQrmxXiS44FA1kBx2+TW0epH8N9fQeuaLTvsHy9Jc62fSyK7w4A0FusrcSV 22z2KGyun8h1qu+JJv/sZYKBWPIVZLfcrUR48uQhd0mqC7s2RENcb+X4XunJloKkTqTUt9 +p8+5PuN+JHXl9N3milHVUHFugM8cZMaejZ+HWRqJuffibi0FU89cI8CFY9jvA== 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 4PnzKy4XJhzt0l; Fri, 31 Mar 2023 11:57:10 +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 32VBvAew086643; Fri, 31 Mar 2023 11:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VBvA4r086642; Fri, 31 Mar 2023 11:57:10 GMT (envelope-from git) Date: Fri, 31 Mar 2023 11:57:10 GMT Message-Id: <202303311157.32VBvA4r086642@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: 126df352f516 - main - linux(4): Move inclusion of i386-specific files under common condition 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/main X-Git-Reftype: branch X-Git-Commit: 126df352f5161c89516f9db83bdb892a170f04fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=126df352f5161c89516f9db83bdb892a170f04fb commit 126df352f5161c89516f9db83bdb892a170f04fb Author: Dmitry Chagin AuthorDate: 2023-03-31 11:56:29 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-31 11:56:29 +0000 linux(4): Move inclusion of i386-specific files under common condition --- sys/modules/linux/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 43d7f2c240b8..8efdb3220585 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -47,9 +47,6 @@ VDSODEPS=linux_vdso_gettc_x86.inc .endif .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux${SFX}_support.S -.else -SRCS+= linux_copyout.c -SRCS+= linux_netlink.c .endif DPSRCS= assym.inc linux${SFX}_genassym.c @@ -72,7 +69,9 @@ SRCS+= imgact_linux.c \ linux_ptrace_machdep.c \ linux_util.c \ linux_vdso_selector_x86.c \ - linux_x86.c + linux_x86.c \ + linux_copyout.c \ + linux_netlink.c .endif .if ${MACHINE_CPUARCH} == "i386"