From nobody Fri Mar 31 11:57:11 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 4PnzKz6v9nz42PNL; Fri, 31 Mar 2023 11:57:11 +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 4PnzKz6Qwnz3mbM; Fri, 31 Mar 2023 11:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680263831; 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=xgV4mZF/QcCPAvjr4lgkZUYn5fy4Tjs9S0Wagw0FVoI=; b=wjuPVNUDH52r9Rqrf5l8bG5+nmWuyiuUYJxX9B0BRq8sL52F2Wth7Dzq6FsynsMsJfnXGV TI/sbFKJPJiHAM1mvoDaoQwCcukKArEaIJo0RfQuVXw4IpyAGAxLij5kR/+LWdS4sBPSJ6 d/egxMrfMrtMwkChdMfmCezIlTUBMqsQIpLp0VWMAMp6A6grYRjW5kFxfiIq5FgcTQK1La RoI8s3EUAxB8Aj6bidfjZiFIFbT/cTKFrlhcE6lAl02nm0nF2AFzldf5TYeLRdSsWNyAkE nqPvNTOJtlX/WiWsEO9jOLa55wR8WFJYwa4Mh35AS+YiwyieYKbrnJzu+32fAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680263831; 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=xgV4mZF/QcCPAvjr4lgkZUYn5fy4Tjs9S0Wagw0FVoI=; b=Jzz3gGPghakZZ3AaB6tsm6nZ8fJpBoEMIrDgJs/g31dvSyiym/eZHTOYNsJj3LOozQmt+t NhRHoCJGo2T0VtYD7gjTMK3oDyyZhyBmzcBu4dDyIquGSOKdQKm1BH0ADeyAb2GhSnREhF 9oiPA8JBQFf8aYWbIvciqxKLkiJrmE4JxJMZX0c8pv6rBUJytQgqb97GvoO0UiE4IHTrdP Jrl028PCDeusVkIUSZj2KCOK51p+dfMAMFfN9BOV9BpVskAJeHYBrpYDLqCALo++AVV9jn eqxDu4j+dKSOqVblrVL28d+m2XDrn4YjS6tKlPG2EDYevQ+mioox7NBj/5iu9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680263831; a=rsa-sha256; cv=none; b=SpCQN16wWHiX9wmGmSbJ4QYTdApBtDbNE7vcSCmlPsXImgpPbqSyVwinjfB8UWIayfDomB UneIwlqNDDwe3z2GLsS4oQp3cyOGEiacnetx8dHEIhOmLwibrnHE+Kqfuqf8y6EUr9JO3T mPu6tqWKxPviO5Zb3kiokN6PTJT+8tG6zNZpYQoijV42CdaJzpTJPkSJR58+IRnMdUQNsl swI9SbjY65tQ0n66sHMBB6TwNYavR4o93PrnsT+ThJCQ7WsaJ6NiC9PKZpJjhjmOpSyYGW GDAxU8u8qTspI8JG5GjK9yYa7FvqNCNA8IheiI7Jxys5KMt4mFO2rFDIjW+B9Q== 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 4PnzKz5V5Czsb7; Fri, 31 Mar 2023 11:57:11 +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 32VBvBWF086662; Fri, 31 Mar 2023 11:57:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VBvBjL086661; Fri, 31 Mar 2023 11:57:11 GMT (envelope-from git) Date: Fri, 31 Mar 2023 11:57:11 GMT Message-Id: <202303311157.32VBvBjL086661@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: 960562652c7a - main - linux(4): Fix opt_netlink.h inclusion 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: 960562652c7a92b8dc97a63105b04e3548f8408c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=960562652c7a92b8dc97a63105b04e3548f8408c commit 960562652c7a92b8dc97a63105b04e3548f8408c Author: Dmitry Chagin AuthorDate: 2023-03-31 11:56:59 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-31 11:56:59 +0000 linux(4): Fix opt_netlink.h inclusion Add opt_netlink.h to the linux_common module, on i386, where we don't uses linux_common module, move opt_netlink.h inclusion under i386 condition. MFC after: 2 weeks --- sys/modules/linux/Makefile | 4 ++-- sys/modules/linux_common/Makefile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 8efdb3220585..2c6aa41a1a18 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -36,7 +36,6 @@ SRCS= linux${SFX}_dummy_machdep.c \ linux_vdso.c \ opt_inet6.h \ opt_ktrace.h \ - opt_netlink.h \ opt_posix.h \ bus_if.h \ device_if.h \ @@ -71,7 +70,8 @@ SRCS+= imgact_linux.c \ linux_vdso_selector_x86.c \ linux_x86.c \ linux_copyout.c \ - linux_netlink.c + linux_netlink.c \ + opt_netlink.h .endif .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 7ebb56ba6473..b7e59e0ac764 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -8,7 +8,8 @@ KMOD= linux_common SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ linux_dummy.c linux_errno.c linux_netlink.c \ - linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h + linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h \ + opt_netlink.h .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_x86.c linux_vdso_selector_x86.c