From nobody Sat Jan 28 17:31:56 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 4P41hs01Nyz3bQ52; Sat, 28 Jan 2023 17:31:57 +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 4P41hr6k0zz49WG; Sat, 28 Jan 2023 17:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674927116; 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=7u5ImxZgWUhp0MDBOsWJRhnPkD6ZZWRgP5QyN+Xd6w8=; b=wrCJ4mmWUOYFjuxlojFwPkD5uf3KLvPkscXsmAr7kibuOiRncrWUGcbJI5fNN3/jPBUO4/ /sbQgmZghsCfdotLeybzhF4cSWP9W62xLNt51fcYuoIEm/KhhiM8E6oG6kErDJ7zUL+BnO /XyakaAFTH1gJZvDt7swgn9F29ZubAzb/k1dQ8pg4j3xPWbMx9tZ87v1K4hKpJbeCZT1BC liraZLwGDY5pDztFImFrznaddFy8QtfH+QlNpmp+CDXPHFDVvIP4Ll5MP42KK9N5QZAtjz t73knh4SThpPeRKtqCDxP72NSMdAl7YjkrPZYBPTlMmB6CHpLAWktQh7l9kQJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674927116; 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=7u5ImxZgWUhp0MDBOsWJRhnPkD6ZZWRgP5QyN+Xd6w8=; b=LlwauMCak6QKdzvV7ZPP/53Nc7DAHNOXgB3PuxEzxbUIguNhAhGkFz7NZK/XSw5YLm/LZ5 nj4d//B1/1WqCaAuUF9n61lVb4s2LjSlpkEG5Eh8RObOCqEZVLtD2rCwQvL8e6JenYuEZ0 5XWinuiycZxNGehWULzB4gXqveJG3jvw0UGyIY+S2Ecnnec21K4oK0HiMkHoFQx3MDtbm+ p2f1NxYzG3owqQYvojHhQPNAFZqRqXQFppfAVQHwSzBRatuT32gsLWms6PZgECveXKAu6o DQfvPSTYr0dxWn4S7u73T5wLt5IljwWIy5wqB8mVNoRe2EYro4niV4xTadZBvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674927116; a=rsa-sha256; cv=none; b=ha1eW7F+Xl8joOH/1LSDjMGRVxWNsQ+dLD2Mugv3PYpm9sct/FYVJjSSuc4+Xe//K6mCXJ WIIEPBXu0x45Mx2cQxUxU7uXR6uVNCMKEhKio0UTF9FJX11mpTtWZTyuDPcCXRzvSsX60i PtpjYUfszHJJC/rptq/hUk1tXtceDpaovgctt+hHd4XU6d/4ZKl6B33nFFt6tsFWiVhNm5 DFHEQvYZMW72bB5L/0aWRM7dPheVGzQKsk10nHTUf/gVXYL28cwTE869s4/3r0k8ilIdSk bWZPtbW/ttLytNkXARrjENue0zrjlvf494iTLgIjYmejv5bEu40uAnv1ETnp3g== 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 4P41hr5pdpzxN6; Sat, 28 Jan 2023 17:31:56 +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 30SHVuIC019474; Sat, 28 Jan 2023 17:31:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30SHVuC4019473; Sat, 28 Jan 2023 17:31:56 GMT (envelope-from git) Date: Sat, 28 Jan 2023 17:31:56 GMT Message-Id: <202301281731.30SHVuC4019473@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: c19fc5cd9b49 - main - linux_common: Fixup .PATH. 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: c19fc5cd9b49115604ce2b89279e3434c7f120cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c19fc5cd9b49115604ce2b89279e3434c7f120cc commit c19fc5cd9b49115604ce2b89279e3434c7f120cc Author: Dmitry Chagin AuthorDate: 2023-01-28 17:31:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-01-28 17:31:38 +0000 linux_common: Fixup .PATH. Since we have arm64, and awaiting ppc64 Linuxulator, do not include x86 specific path to the module build for non x86 architectures. MFC after: 1 week --- sys/modules/linux_common/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index a3ceacc244a4..7ebb56ba6473 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -1,6 +1,9 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/x86/linux +.PATH: ${SRCTOP}/sys/compat/linux +.if ${MACHINE_CPUARCH} == "amd64" +.PATH: ${SRCTOP}/sys/x86/linux +.endif KMOD= linux_common SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \