d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename linuxapi[.ko] into linuxkpi[.ko], to reflect that it is a

Browse Source 
kernel programming interface module, KPI, to avoid confusion with the
existing Linux userspace binary compatibility shims. Bump the
FreeBSD_version number.

Reviewed by:	np @
Suggested by:	dumbbell @
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2015-10-22 09:50:45 +00:00
parent aff5735784
commit 2da3897d01
15 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/conf/files
View File

@ -3797,15 +3797,15 @@ nlm/nlm_prot_xdr.c optional nfslockd | nfsd
nlm/sm_inter_xdr.c optional nfslockd | nfsd
# Linux Kernel Compatibility API
ofed/include/linux/linux_kmod.c optional ofed | compat_linuxapi \
ofed/include/linux/linux_kmod.c optional ofed | compat_linuxkpi \
no-depend compile-with "${OFED_C}"
ofed/include/linux/linux_compat.c optional ofed | compat_linuxapi \
ofed/include/linux/linux_compat.c optional ofed | compat_linuxkpi \
no-depend compile-with "${OFED_C}"
ofed/include/linux/linux_pci.c optional ofed | compat_linuxapi \
ofed/include/linux/linux_pci.c optional ofed | compat_linuxkpi \
no-depend compile-with "${OFED_C}"
ofed/include/linux/linux_idr.c optional ofed | compat_linuxapi \
ofed/include/linux/linux_idr.c optional ofed | compat_linuxkpi \
no-depend compile-with "${OFED_C}"
ofed/include/linux/linux_radix.c optional ofed | compat_linuxapi \
ofed/include/linux/linux_radix.c optional ofed | compat_linuxkpi \
no-depend compile-with "${OFED_C}"
# OpenFabrics Enterprise Distribution (Infiniband)
ofed/drivers/infiniband/core/addr.c optional ofed \

2
sys/conf/options
View File

@ -86,7 +86,7 @@ COMPAT_FREEBSD7 opt_compat.h
COMPAT_FREEBSD9 opt_compat.h
COMPAT_FREEBSD10 opt_compat.h
COMPAT_CLOUDABI64 opt_dontuse.h
COMPAT_LINUXAPI opt_compat.h
COMPAT_LINUXKPI opt_compat.h
COMPILING_LINT opt_global.h
CY_PCI_FASTINTR
DEADLKRES opt_watchdog.h

2
sys/contrib/rdma/krping/krping.c
View File

@ -61,7 +61,7 @@ MODULE_AUTHOR("Steve Wise");
MODULE_DESCRIPTION("RDMA ping client/server");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_VERSION(krping, 1);
MODULE_DEPEND(krping, linuxapi, 1, 1, 1);
MODULE_DEPEND(krping, linuxkpi, 1, 1, 1);
static __inline uint64_t
get_cycles(void)

2
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
View File

@ -296,5 +296,5 @@ MODULE_DEPEND(t3_tom, cxgbc, 1, 1, 1);
MODULE_DEPEND(iw_cxgb, toecore, 1, 1, 1);
MODULE_DEPEND(iw_cxgb, t3_tom, 1, 1, 1);
MODULE_DEPEND(iw_cxgb, ibcore, 1, 1, 1);
MODULE_DEPEND(iw_cxgb, linuxapi, 1, 1, 1);
MODULE_DEPEND(iw_cxgb, linuxkpi, 1, 1, 1);

2
sys/dev/cxgbe/iw_cxgbe/device.c
View File

@ -363,5 +363,5 @@ MODULE_VERSION(iw_cxgbe, 1);
MODULE_DEPEND(iw_cxgbe, t4nex, 1, 1, 1);
MODULE_DEPEND(iw_cxgbe, t4_tom, 1, 1, 1);
MODULE_DEPEND(iw_cxgbe, ibcore, 1, 1, 1);
MODULE_DEPEND(iw_cxgbe, linuxapi, 1, 1, 1);
MODULE_DEPEND(iw_cxgbe, linuxkpi, 1, 1, 1);
DECLARE_MODULE(iw_cxgbe, c4iw_mod_data, SI_SUB_EXEC, SI_ORDER_ANY);

4
sys/modules/Makefile
View File

@ -203,7 +203,7 @@ SUBDIR= \
${_linux} \
${_linux_common} \
${_linux64} \
${_linuxapi} \
${_linuxkpi} \
lmc \
lpt \
mac_biba \
@ -534,7 +534,7 @@ _linprocfs= linprocfs
_linsysfs= linsysfs
_linux= linux
.if ${MK_OFED} != "no"
_linuxapi= linuxapi
_linuxkpi= linuxkpi
.endif
_ndis= ndis
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)

2
sys/modules/linuxapi/Makefile → sys/modules/linuxkpi/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../ofed/include/linux
KMOD= linuxapi
KMOD= linuxkpi
SRCS= linux_kmod.c \
linux_compat.c \
linux_pci.c \

2
sys/ofed/drivers/infiniband/core/device.c
View File

@ -789,5 +789,5 @@ static moduledata_t ibcore_mod = {
};
MODULE_VERSION(ibcore, 1);
MODULE_DEPEND(ibcore, linuxapi, 1, 1, 1);
MODULE_DEPEND(ibcore, linuxkpi, 1, 1, 1);
DECLARE_MODULE(ibcore, ibcore_mod, SI_SUB_SMP, SI_ORDER_ANY);

2
sys/ofed/drivers/infiniband/hw/mlx4/main.c
View File

@ -2884,4 +2884,4 @@ static moduledata_t mlx4ib_mod = {
DECLARE_MODULE(mlx4ib, mlx4ib_mod, SI_SUB_SMP, SI_ORDER_ANY);
MODULE_DEPEND(mlx4ib, mlx4, 1, 1, 1);
MODULE_DEPEND(mlx4ib, ibcore, 1, 1, 1);
MODULE_DEPEND(mlx4ib, linuxapi, 1, 1, 1);
MODULE_DEPEND(mlx4ib, linuxkpi, 1, 1, 1);

2
sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
View File

@ -48,7 +48,7 @@ MODULE_AUTHOR("Roland Dreier");
MODULE_DESCRIPTION("Mellanox InfiniBand HCA low-level driver");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_VERSION(mthca, 1);
MODULE_DEPEND(mthca, linuxapi, 1, 1, 1);
MODULE_DEPEND(mthca, linuxkpi, 1, 1, 1);
MODULE_DEPEND(mthca, ibcore, 1, 1, 1);
#ifdef CONFIG_INFINIBAND_MTHCA_DEBUG

2
sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
View File

@ -1541,4 +1541,4 @@ static moduledata_t ipoib_mod = {
DECLARE_MODULE(ipoib, ipoib_mod, SI_SUB_SMP, SI_ORDER_ANY);
MODULE_DEPEND(ipoib, ibcore, 1, 1, 1);
MODULE_DEPEND(ipoib, linuxapi, 1, 1, 1);
MODULE_DEPEND(ipoib, linuxkpi, 1, 1, 1);

2
sys/ofed/drivers/net/mlx4/en_main.c
View File

@ -349,4 +349,4 @@ static moduledata_t mlxen_mod = {
};
DECLARE_MODULE(mlxen, mlxen_mod, SI_SUB_OFED_PREINIT, SI_ORDER_ANY);
MODULE_DEPEND(mlxen, mlx4, 1, 1, 1);
MODULE_DEPEND(mlxen, linuxapi, 1, 1, 1);
MODULE_DEPEND(mlxen, linuxkpi, 1, 1, 1);

2
sys/ofed/drivers/net/mlx4/main.c
View File

@ -3809,5 +3809,5 @@ static moduledata_t mlx4_mod = {
};
MODULE_VERSION(mlx4, 1);
DECLARE_MODULE(mlx4, mlx4_mod, SI_SUB_OFED_PREINIT, SI_ORDER_ANY);
MODULE_DEPEND(mlx4, linuxapi, 1, 1, 1);
MODULE_DEPEND(mlx4, linuxkpi, 1, 1, 1);

4
sys/ofed/include/linux/linux_kmod.c
View File

@ -30,6 +30,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/module.h>
MODULE_VERSION(linuxapi, 1);
MODULE_DEPEND(linuxapi, pci, 1, 1, 1);
MODULE_VERSION(linuxkpi, 1);
MODULE_DEPEND(linuxkpi, pci, 1, 1, 1);

2
sys/sys/param.h
View File

@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
#define __FreeBSD_version 1100082 /* Master, propagated to newvers */
#define __FreeBSD_version 1100083 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,