Page MenuHomeFreeBSD
Files F166713891

D36683.diff
No OneTemporary
Actions

D36683.diff
View Options

diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -108,6 +108,9 @@
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
--- a/sys/modules/axgbe/if_axa/Makefile
+++ b/sys/modules/axgbe/if_axa/Makefile
@@ -7,6 +7,6 @@
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
--- a/sys/modules/axgbe/if_axp/Makefile
+++ b/sys/modules/axgbe/if_axp/Makefile
@@ -7,6 +7,6 @@
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
--- a/sys/modules/cxgbe/iw_cxgbe/Makefile
+++ b/sys/modules/cxgbe/iw_cxgbe/Makefile
@@ -18,7 +18,7 @@
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
--- a/sys/modules/ibcore/Makefile
+++ b/sys/modules/ibcore/Makefile
@@ -49,7 +49,7 @@
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
--- a/sys/modules/ipoib/Makefile
+++ b/sys/modules/ipoib/Makefile
@@ -10,7 +10,7 @@
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
--- a/sys/modules/irdma/Makefile
+++ b/sys/modules/irdma/Makefile
@@ -14,7 +14,7 @@
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
--- a/sys/modules/iser/Makefile
+++ b/sys/modules/iser/Makefile
@@ -18,7 +18,7 @@
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
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -35,7 +35,7 @@
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
--- a/sys/modules/lindebugfs/Makefile
+++ b/sys/modules/lindebugfs/Makefile
@@ -6,6 +6,6 @@
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
--- a/sys/modules/linuxkpi/Makefile
+++ b/sys/modules/linuxkpi/Makefile
@@ -46,7 +46,7 @@
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
--- a/sys/modules/linuxkpi_wlan/Makefile
+++ b/sys/modules/linuxkpi_wlan/Makefile
@@ -8,7 +8,7 @@
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
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -28,7 +28,7 @@
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
--- a/sys/modules/mlx4en/Makefile
+++ b/sys/modules/mlx4en/Makefile
@@ -14,6 +14,6 @@
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
--- a/sys/modules/mlx4ib/Makefile
+++ b/sys/modules/mlx4ib/Makefile
@@ -21,7 +21,7 @@
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
--- a/sys/modules/mlx5/Makefile
+++ b/sys/modules/mlx5/Makefile
@@ -40,7 +40,7 @@
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
--- a/sys/modules/mlx5en/Makefile
+++ b/sys/modules/mlx5en/Makefile
@@ -32,7 +32,7 @@
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
--- a/sys/modules/mlx5fpga_tools/Makefile
+++ b/sys/modules/mlx5fpga_tools/Makefile
@@ -11,7 +11,7 @@
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
--- a/sys/modules/mlx5ib/Makefile
+++ b/sys/modules/mlx5ib/Makefile
@@ -21,7 +21,7 @@
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
--- a/sys/modules/mlxfw/Makefile
+++ b/sys/modules/mlxfw/Makefile
@@ -11,7 +11,7 @@
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
--- a/sys/modules/mthca/Makefile
+++ b/sys/modules/mthca/Makefile
@@ -26,7 +26,7 @@
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
--- a/sys/modules/qat/qat/Makefile
+++ b/sys/modules/qat/qat/Makefile
@@ -7,7 +7,7 @@
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
--- 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/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
--- a/sys/modules/qat/qat_common/Makefile
+++ b/sys/modules/qat/qat_common/Makefile
@@ -24,6 +24,6 @@
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
--- a/sys/modules/qat/qat_hw/Makefile
+++ b/sys/modules/qat/qat_hw/Makefile
@@ -13,7 +13,7 @@
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
--- a/sys/modules/qlnx/qlnxe/Makefile
+++ b/sys/modules/qlnx/qlnxe/Makefile
@@ -69,7 +69,7 @@
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
--- a/sys/modules/qlnx/qlnxev/Makefile
+++ b/sys/modules/qlnx/qlnxev/Makefile
@@ -60,7 +60,7 @@
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
--- a/sys/modules/qlnx/qlnxr/Makefile
+++ b/sys/modules/qlnx/qlnxr/Makefile
@@ -54,7 +54,7 @@
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
--- a/sys/modules/rdma/krping/Makefile
+++ b/sys/modules/rdma/krping/Makefile
@@ -7,6 +7,6 @@
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
--- a/sys/modules/rtw88/Makefile
+++ b/sys/modules/rtw88/Makefile
@@ -36,7 +36,7 @@
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
--- a/sys/modules/rtw89/Makefile
+++ b/sys/modules/rtw89/Makefile
@@ -31,7 +31,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 16, 8:21 PM (1 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36834530
Default Alt Text
D36683.diff (12 KB)

Event Timeline