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

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

diff --git a/sys/conf/files b/sys/conf/files
index 7c58be9a2b43db9b0a259016b46b47b1e81ab368..9533c2bf3ef049357d9a3cb8251fe33300538356 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -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           \

diff --git a/sys/conf/options b/sys/conf/options
index dcea435a3c9782b46b1ad8b588bf77cba6e790b6..346e22ee7abffd7539a78a1c85788f8ab496c340 100644 (file)
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -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

diff --git a/sys/contrib/rdma/krping/krping.c b/sys/contrib/rdma/krping/krping.c
index 94b2eb94e41a432d5f735a3f16fca929a6d50ac3..6ffaa38fde90a49e9d9d4c63547f571fc6ddfe45 100644 (file)
--- a/sys/contrib/rdma/krping/krping.c
+++ b/sys/contrib/rdma/krping/krping.c
@@ -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)

diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
index 18876fe4245b6366209f6584cbddef45ae03efbf..7b21daa04f50f08e55c16ec6f821fa285a9cc256 100644 (file)
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
@@ -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);
 

diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c
index 29378ae9d377ae2860f5d98017f3fd4a9282c5be..6de0de6f803a82369721b39fae04b436af277c31 100644 (file)
--- a/sys/dev/cxgbe/iw_cxgbe/device.c
+++ b/sys/dev/cxgbe/iw_cxgbe/device.c
@@ -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);

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index ad54a599ed0b7847f16757db6f1f23a3bef9d723..e22a92ac1cd9722b3c4d91c14c8f11eaba9d320e 100644 (file)
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -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)

diff --git a/sys/modules/linuxapi/Makefile b/sys/modules/linuxapi/Makefile
deleted file mode 100644 (file)
index b10d125..0000000
--- a/sys/modules/linuxapi/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-.PATH: ${.CURDIR}/../../ofed/include/linux
-
-KMOD=  linuxapi
-SRCS=  linux_kmod.c \
-       linux_compat.c \
-       linux_pci.c \
-       linux_radix.c \
-       linux_idr.c
-
-SRCS+= bus_if.h \
-       device_if.h \
-       pci_if.h \
-       vnode_if.h
-
-CFLAGS+= -I${.CURDIR}/../../ofed/include/
-
-.include <bsd.kmod.mk>

diff --git a/sys/modules/linuxkpi/Makefile b/sys/modules/linuxkpi/Makefile
new file mode 100644 (file)
index 0000000..47aa6cd
--- /dev/null
+++ b/sys/modules/linuxkpi/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+.PATH: ${.CURDIR}/../../ofed/include/linux
+
+KMOD=  linuxkpi
+SRCS=  linux_kmod.c \
+       linux_compat.c \
+       linux_pci.c \
+       linux_radix.c \
+       linux_idr.c
+
+SRCS+= bus_if.h \
+       device_if.h \
+       pci_if.h \
+       vnode_if.h
+
+CFLAGS+= -I${.CURDIR}/../../ofed/include/
+
+.include <bsd.kmod.mk>

diff --git a/sys/ofed/drivers/infiniband/core/device.c b/sys/ofed/drivers/infiniband/core/device.c
index a7a06d78164cc94563e49a435c079fa5398daefc..db3b831eb4221bf3fca940c0ad2018c6782286f4 100644 (file)
--- a/sys/ofed/drivers/infiniband/core/device.c
+++ b/sys/ofed/drivers/infiniband/core/device.c
@@ -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);

diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/main.c b/sys/ofed/drivers/infiniband/hw/mlx4/main.c
index bdcffbe84f926d319b9510cf1ac3735b7991501d..2fdd28138f1e939175a84e9ec51fd75b2ae59009 100644 (file)
--- a/sys/ofed/drivers/infiniband/hw/mlx4/main.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/main.c
@@ -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);

diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c b/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
index 8596bdd3d7eb5211495d4ff141a47d4df13f888e..697af31f4dbff37a96d88baba977edb7f244ac9e 100644 (file)
--- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
@@ -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

diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 53ac66d304d7f5b84a1a7b786119f8325f92d7f5..1077b4050f3917fddb75ad02756d2dbc85b787a2 100644 (file)
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -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);

diff --git a/sys/ofed/drivers/net/mlx4/en_main.c b/sys/ofed/drivers/net/mlx4/en_main.c
index 4a2d571300e52e698f3811b263a77737017e5679..3aa47452c14014e2758dab9bca5d97d475d43862 100644 (file)
--- a/sys/ofed/drivers/net/mlx4/en_main.c
+++ b/sys/ofed/drivers/net/mlx4/en_main.c
@@ -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);

diff --git a/sys/ofed/drivers/net/mlx4/main.c b/sys/ofed/drivers/net/mlx4/main.c
index bd4aa6a022adef21198efc4fe8ceedd570172451..cce2324862ff350c713b1d9cfc74167bf77c6d4a 100644 (file)
--- a/sys/ofed/drivers/net/mlx4/main.c
+++ b/sys/ofed/drivers/net/mlx4/main.c
@@ -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);
 

diff --git a/sys/ofed/include/linux/linux_kmod.c b/sys/ofed/include/linux/linux_kmod.c
index f6508e3b41f15bb440a0d1c492e5bfb27d897f0a..efe16fbb1aa9c058d9ea2a3502efe94274b4771e 100644 (file)
--- a/sys/ofed/include/linux/linux_kmod.c
+++ b/sys/ofed/include/linux/linux_kmod.c
@@ -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);
 

diff --git a/sys/sys/param.h b/sys/sys/param.h
index 4ff90e0d24b2756d119ea38395aaff7f2fbcd9db..9df3c9ce3a6366079b44512b683741968a28f249 100644 (file)
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -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,