git: 960562652c7a - main - linux(4): Fix opt_netlink.h inclusion
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 31 Mar 2023 11:57:11 UTC
The branch main has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=960562652c7a92b8dc97a63105b04e3548f8408c
commit 960562652c7a92b8dc97a63105b04e3548f8408c
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-03-31 11:56:59 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
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