git: 514fb3872166 - main - LinuxKPI: define LINUXKPI_INCLUDES for module builds as well
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 26 Sep 2022 19:36:59 UTC
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=514fb3872166a361faa81d89909f65913e90b1b2
commit 514fb3872166a361faa81d89909f65913e90b1b2
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2022-09-23 21:18:45 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2022-09-26 19:34:01 +0000
LinuxKPI: define LINUXKPI_INCLUDES for module builds as well
While for in-kernel we already have LINUXKPI_INCLUDES in kern.pre.mk
for kmod builds we've not had a common define to use leading to various
spellings of include paths.
In order for the include list to be expanded more easily in the future,
e.g., adding the "dummy" includes (for all) and to harmonize code,
duplicate LINUXKPI_INCLUDES to kmod.mk and use it for all module Makefiles.
MFC after: 1 week
Reviewed by: hselasky
Differential Revision: https://reviews.freebsd.org/D36683
---
sys/conf/kmod.mk | 3 +++
sys/modules/axgbe/if_axa/Makefile | 2 +-
sys/modules/axgbe/if_axp/Makefile | 2 +-
sys/modules/cxgbe/iw_cxgbe/Makefile | 2 +-
sys/modules/ibcore/Makefile | 2 +-
sys/modules/ipoib/Makefile | 2 +-
sys/modules/irdma/Makefile | 2 +-
sys/modules/iser/Makefile | 2 +-
sys/modules/iwlwifi/Makefile | 2 +-
sys/modules/lindebugfs/Makefile | 2 +-
sys/modules/linuxkpi/Makefile | 2 +-
sys/modules/linuxkpi_wlan/Makefile | 2 +-
sys/modules/mlx4/Makefile | 2 +-
sys/modules/mlx4en/Makefile | 2 +-
sys/modules/mlx4ib/Makefile | 2 +-
sys/modules/mlx5/Makefile | 2 +-
sys/modules/mlx5en/Makefile | 2 +-
sys/modules/mlx5fpga_tools/Makefile | 2 +-
sys/modules/mlx5ib/Makefile | 2 +-
sys/modules/mlxfw/Makefile | 2 +-
sys/modules/mthca/Makefile | 2 +-
sys/modules/qat/qat/Makefile | 2 +-
sys/modules/qat/qat_api/Makefile | 2 +-
sys/modules/qat/qat_common/Makefile | 2 +-
sys/modules/qat/qat_hw/Makefile | 2 +-
sys/modules/qlnx/qlnxe/Makefile | 2 +-
sys/modules/qlnx/qlnxev/Makefile | 2 +-
sys/modules/qlnx/qlnxr/Makefile | 2 +-
sys/modules/rdma/krping/Makefile | 2 +-
sys/modules/rtw88/Makefile | 2 +-
sys/modules/rtw89/Makefile | 2 +-
31 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 7ec3c918d5d8..b9f3a6ce006d 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -108,6 +108,9 @@ LINUXKPI_GENSRCS+= \
opt_usb.h \
opt_stack.h
+LINUXKPI_INCLUDES+= \
+ -I${SYSDIR}/compat/linuxkpi/common/include
+
CFLAGS+= ${WERROR}
CFLAGS+= -D_KERNEL
CFLAGS+= -DKLD_MODULE
diff --git a/sys/modules/axgbe/if_axa/Makefile b/sys/modules/axgbe/if_axa/Makefile
index fd1cae37cacd..ed4d285b7ff1 100644
--- a/sys/modules/axgbe/if_axa/Makefile
+++ b/sys/modules/axgbe/if_axa/Makefile
@@ -7,6 +7,6 @@ SRCS = device_if.h bus_if.h miibus_if.h ofw_bus_if.h ifdi_if.h vnode_if.h
SRCS += opt_inet.h opt_inet6.h opt_rss.h opt_iflib.h opt_platform.h
SRCS += if_axgbe.c xgbe-sysctl.c xgbe_osdep.c xgbe-desc.c xgbe-drv.c xgbe-mdio.c xgbe-dev.c xgbe-i2c.c xgbe-phy-v1.c xgbe-txrx.c
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/axgbe/if_axp/Makefile b/sys/modules/axgbe/if_axp/Makefile
index 4253a529348c..60b8d24b0909 100644
--- a/sys/modules/axgbe/if_axp/Makefile
+++ b/sys/modules/axgbe/if_axp/Makefile
@@ -7,6 +7,6 @@ SRCS = device_if.h bus_if.h miibus_if.h pci_if.h ifdi_if.h vnode_if.h
SRCS += opt_inet.h opt_inet6.h opt_rss.h opt_iflib.h opt_platform.h
SRCS += if_axgbe_pci.c xgbe-sysctl.c xgbe_osdep.c xgbe-desc.c xgbe-drv.c xgbe-mdio.c xgbe-dev.c xgbe-i2c.c xgbe-phy-v2.c xgbe-txrx.c
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile
index 72631f585bc4..cfe06a696fcb 100644
--- a/sys/modules/cxgbe/iw_cxgbe/Makefile
+++ b/sys/modules/cxgbe/iw_cxgbe/Makefile
@@ -18,7 +18,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_kern_tls.h opt_ktr.h opt_ofed.h
CFLAGS+= -I${CXGBE} -I${SRCTOP}/sys/ofed/include -DLINUX_TYPES_DEFINED
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
CFLAGS+= -DINET6 -DINET
diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile
index 2f738b1702b7..e4e3c7056ce5 100644
--- a/sys/modules/ibcore/Makefile
+++ b/sys/modules/ibcore/Makefile
@@ -49,7 +49,7 @@ SRCS+= opt_inet.h opt_inet6.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DINET6 -DINET -DCONFIG_INFINIBAND_USER_MEM
EXPORT_SYMS= YES
diff --git a/sys/modules/ipoib/Makefile b/sys/modules/ipoib/Makefile
index 2eb9f348e91b..b10a9150c04a 100644
--- a/sys/modules/ipoib/Makefile
+++ b/sys/modules/ipoib/Makefile
@@ -10,7 +10,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_ofed.h
CFLAGS+= -I${SRCTOP}/sys/ofed/drivers/infiniband/ulp/ipoib
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/irdma/Makefile b/sys/modules/irdma/Makefile
index f212a8a1a658..b2ffb67ca66f 100644
--- a/sys/modules/irdma/Makefile
+++ b/sys/modules/irdma/Makefile
@@ -14,7 +14,7 @@ SRCS+= irdma_ctrl.c irdma_hmc.c icrdma_hw.c irdma_pble.c irdma_puda.c irdma_uda.
CFLAGS+= -I${ICE_DIR} -I${OFED_INC_DIR}
CFLAGS+= -I${OFED_INC_DIR}/uapi
-CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
ice_rdma.h:
diff --git a/sys/modules/iser/Makefile b/sys/modules/iser/Makefile
index c24c42a0f6fb..4961c95599af 100644
--- a/sys/modules/iser/Makefile
+++ b/sys/modules/iser/Makefile
@@ -18,7 +18,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_cam.h icl_conn_if.h
CFLAGS+= -I${SYSDIR}/
CFLAGS+= -I${SYSDIR}/ofed/include
CFLAGS+= -I${SYSDIR}/ofed/include/uapi
-CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
CFLAGS+= -DINET6 -DINET
CFLAGS+= -fms-extensions
diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
index e1bc1f25fe74..f33bf5418dd8 100644
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -35,7 +35,7 @@ SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h
CFLAGS+= -DKBUILD_MODNAME='"iwlwifi"'
CFLAGS+= -I${DEVIWLWIFIDIR}
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_IWLDVM=0
CFLAGS+= -DCONFIG_IWLMVM=1
# Helpful after fresh imports.
diff --git a/sys/modules/lindebugfs/Makefile b/sys/modules/lindebugfs/Makefile
index da61fd519e96..024b945dfc6c 100644
--- a/sys/modules/lindebugfs/Makefile
+++ b/sys/modules/lindebugfs/Makefile
@@ -6,6 +6,6 @@ KMOD= lindebugfs
SRCS= lindebugfs.c
SRCS+= ${LINUXKPI_GENSRCS}
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/linuxkpi/Makefile b/sys/modules/linuxkpi/Makefile
index aa2c452db03a..e297361fce79 100644
--- a/sys/modules/linuxkpi/Makefile
+++ b/sys/modules/linuxkpi/Makefile
@@ -46,7 +46,7 @@ SRCS+= opt_apic.h
SRCS+= opt_ddb.h
SRCS+= ${LINUXKPI_GENSRCS}
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include
EXPORT_SYMS= YES
diff --git a/sys/modules/linuxkpi_wlan/Makefile b/sys/modules/linuxkpi_wlan/Makefile
index 4aba6f83137f..fccd1249bc72 100644
--- a/sys/modules/linuxkpi_wlan/Makefile
+++ b/sys/modules/linuxkpi_wlan/Makefile
@@ -8,7 +8,7 @@ SRCS= linux_80211.c \
SRCS+= opt_wlan.h
SRCS+= ${LINUXKPI_GENSRCS}
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
EXPORT_SYMS= YES
diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile
index 96818c2ef3d0..6cffacef5d7a 100644
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -28,7 +28,7 @@ SRCS+= opt_inet.h opt_inet6.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
EXPORT_SYMS= YES
diff --git a/sys/modules/mlx4en/Makefile b/sys/modules/mlx4en/Makefile
index b03f93008333..34f24959b54b 100644
--- a/sys/modules/mlx4en/Makefile
+++ b/sys/modules/mlx4en/Makefile
@@ -14,6 +14,6 @@ SRCS+= ${LINUXKPI_GENSRCS}
SRCS+= opt_inet.h opt_inet6.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/mlx4ib/Makefile b/sys/modules/mlx4ib/Makefile
index dc819d7ef01d..2b0158e02544 100644
--- a/sys/modules/mlx4ib/Makefile
+++ b/sys/modules/mlx4ib/Makefile
@@ -21,7 +21,7 @@ SRCS+= opt_inet.h opt_inet6.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
CFLAGS+= -DINET6 -DINET
diff --git a/sys/modules/mlx5/Makefile b/sys/modules/mlx5/Makefile
index f9e282789d1c..3eb21722f777 100644
--- a/sys/modules/mlx5/Makefile
+++ b/sys/modules/mlx5/Makefile
@@ -40,7 +40,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.if defined(CONFIG_BUILD_FPGA)
SRCS+= \
diff --git a/sys/modules/mlx5en/Makefile b/sys/modules/mlx5en/Makefile
index cc2cc264b435..ade9f75c12d8 100644
--- a/sys/modules/mlx5en/Makefile
+++ b/sys/modules/mlx5en/Makefile
@@ -32,7 +32,7 @@ CFLAGS+= -DCONFIG_MLX5_FPGA
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/mlx5fpga_tools/Makefile b/sys/modules/mlx5fpga_tools/Makefile
index 1fe938862b38..0e8c29caf9de 100644
--- a/sys/modules/mlx5fpga_tools/Makefile
+++ b/sys/modules/mlx5fpga_tools/Makefile
@@ -11,7 +11,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/mlx5ib/Makefile b/sys/modules/mlx5ib/Makefile
index 7a3c4d218731..b9ed8076b54d 100644
--- a/sys/modules/mlx5ib/Makefile
+++ b/sys/modules/mlx5ib/Makefile
@@ -21,7 +21,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_ratelimit.h opt_rss.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
.if defined(CONFIG_BUILD_FPGA)
diff --git a/sys/modules/mlxfw/Makefile b/sys/modules/mlxfw/Makefile
index 5980a49dabee..899f58df8f13 100644
--- a/sys/modules/mlxfw/Makefile
+++ b/sys/modules/mlxfw/Makefile
@@ -11,7 +11,7 @@ SRCS+= ${LINUXKPI_GENSRCS}
CFLAGS+= \
-I${SRCTOP}/sys/ofed/include \
-I${SRCTOP}/sys/ofed/include/uapi \
- -I${SRCTOP}/sys/compat/linuxkpi/common/include \
+ ${LINUXKPI_INCLUDES} \
-I${SRCTOP}/sys/contrib/xz-embedded/freebsd \
-I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz
diff --git a/sys/modules/mthca/Makefile b/sys/modules/mthca/Makefile
index 584a86b6ada7..d7807157f50c 100644
--- a/sys/modules/mthca/Makefile
+++ b/sys/modules/mthca/Makefile
@@ -26,7 +26,7 @@ SRCS+= opt_inet.h opt_inet6.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
CFLAGS+= -DINET6 -DINET
diff --git a/sys/modules/qat/qat/Makefile b/sys/modules/qat/qat/Makefile
index 7973faa2c4cb..a8b58573a272 100644
--- a/sys/modules/qat/qat/Makefile
+++ b/sys/modules/qat/qat/Makefile
@@ -7,7 +7,7 @@ KMOD= qat
SRCS+= qat_ocf.c qat_ocf_mem_pool.c qat_ocf_utils.c
SRCS+= device_if.h bus_if.h vnode_if.h pci_if.h cryptodev_if.h
-CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include/common
CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/include
diff --git a/sys/modules/qat/qat_api/Makefile b/sys/modules/qat/qat_api/Makefile
index 20f3acd4ecdd..76b9c8965e1a 100644
--- a/sys/modules/qat/qat_api/Makefile
+++ b/sys/modules/qat/qat_api/Makefile
@@ -69,7 +69,7 @@ CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/common/compression/include
CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/common/crypto/sym/include
CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/firmware/include
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include/common
-CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/qat/qat_common/Makefile b/sys/modules/qat/qat_common/Makefile
index a2ea45fb6846..9645d3b765db 100644
--- a/sys/modules/qat/qat_common/Makefile
+++ b/sys/modules/qat/qat_common/Makefile
@@ -24,6 +24,6 @@ SRCS+= bus_if.h device_if.h pci_if.h vnode_if.h
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include/common
-CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/qat/qat_hw/Makefile b/sys/modules/qat/qat_hw/Makefile
index 813f894757a7..820af989b536 100644
--- a/sys/modules/qat/qat_hw/Makefile
+++ b/sys/modules/qat/qat_hw/Makefile
@@ -13,7 +13,7 @@ SRCS+= qat_c4xxx/adf_c4xxx_pke_replay_stats.c qat_c4xxx/adf_c4xxx_ras.c qat_c4xx
SRCS+= qat_c4xxx/adf_c4xxx_reset.c
SRCS+= device_if.h bus_if.h vnode_if.h pci_if.h cryptodev_if.h
-CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include/common
CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/include
diff --git a/sys/modules/qlnx/qlnxe/Makefile b/sys/modules/qlnx/qlnxe/Makefile
index 5d1d0eefec64..b033e4a623b5 100644
--- a/sys/modules/qlnx/qlnxe/Makefile
+++ b/sys/modules/qlnx/qlnxe/Makefile
@@ -69,7 +69,7 @@ CFLAGS += -DECORE_PACKAGE
CFLAGS += -DCONFIG_ECORE_L2
CFLAGS += -DECORE_CONFIG_DIRECT_HWFN
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
#CFLAGS += -g
#CFLAGS += -fno-inline
diff --git a/sys/modules/qlnx/qlnxev/Makefile b/sys/modules/qlnx/qlnxev/Makefile
index 4c79eee59a55..89ba62cd3027 100644
--- a/sys/modules/qlnx/qlnxev/Makefile
+++ b/sys/modules/qlnx/qlnxev/Makefile
@@ -60,7 +60,7 @@ CFLAGS += -DECORE_PACKAGE
CFLAGS += -DCONFIG_ECORE_L2
CFLAGS += -DECORE_CONFIG_DIRECT_HWFN
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS += -g
CFLAGS += -fno-inline
diff --git a/sys/modules/qlnx/qlnxr/Makefile b/sys/modules/qlnx/qlnxr/Makefile
index f193ff09e7ef..f02089588942 100644
--- a/sys/modules/qlnx/qlnxr/Makefile
+++ b/sys/modules/qlnx/qlnxr/Makefile
@@ -54,7 +54,7 @@ CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${ETHDRVR}
CFLAGS+= -I${OFEDDIR}/ofed/include
CFLAGS+= -I${OFEDDIR}/ofed/include/uapi
-CFLAGS+= -I${OFEDDIR}/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DLINUX_TYPES_DEFINED
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
diff --git a/sys/modules/rdma/krping/Makefile b/sys/modules/rdma/krping/Makefile
index 97c2fdedb91d..7f3a4962190e 100644
--- a/sys/modules/rdma/krping/Makefile
+++ b/sys/modules/rdma/krping/Makefile
@@ -7,6 +7,6 @@ SRCS+= ${LINUXKPI_GENSRCS}
SRCS+= opt_inet.h opt_inet6.h
CFLAGS+= -I${SRCTOP}/sys/ofed/include
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
.include <bsd.kmod.mk>
diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile
index aaaadfdca2d7..8ac4a8b8be65 100644
--- a/sys/modules/rtw88/Makefile
+++ b/sys/modules/rtw88/Makefile
@@ -36,7 +36,7 @@ SRCS+= opt_wlan.h opt_inet6.h opt_inet.h
CFLAGS+= -DKBUILD_MODNAME='"rtw88"'
CFLAGS+= -I${DEVRTW88DIR}
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_RTW88_DEBUG
#CFLAGS+= -DCONFIG_RTW88_DEBUGFS
diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile
index d5b6cec50bb8..42e9d276c537 100644
--- a/sys/modules/rtw89/Makefile
+++ b/sys/modules/rtw89/Makefile
@@ -31,7 +31,7 @@ SRCS+= opt_wlan.h opt_inet6.h opt_inet.h
CFLAGS+= -DKBUILD_MODNAME='"rtw89"'
CFLAGS+= -I${DEVRTW89DIR}
-CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
+CFLAGS+= ${LINUXKPI_INCLUDES}
CFLAGS+= -DCONFIG_RTW89_DEBUGMSG
#CFLAGS+= -DCONFIG_RTW89_DEBUGFS