svn commit: r367557 - in stable/11/sys: compat/linuxkpi/common/include/linux compat/linuxkpi/common/src conf modules/linuxkpi
Hans Petter Selasky
hselasky at FreeBSD.org
Tue Nov 10 13:13:38 UTC 2020
Author: hselasky
Date: Tue Nov 10 13:13:37 2020
New Revision: 367557
URL: https://svnweb.freebsd.org/changeset/base/367557
Log:
MFC r364860 and r366996:
Implement extensible arrays API using the existing radix tree implementation
in the LinuxKPI.
Differential Revision: https://reviews.freebsd.org/D25101
Reviewed by: kib @
Sponsored by: Mellanox Technologies // NVIDIA Networking
Added:
stable/11/sys/compat/linuxkpi/common/include/linux/xarray.h
- copied, changed from r364860, head/sys/compat/linuxkpi/common/include/linux/xarray.h
stable/11/sys/compat/linuxkpi/common/src/linux_xarray.c
- copied, changed from r364860, head/sys/compat/linuxkpi/common/src/linux_xarray.c
Modified:
stable/11/sys/conf/files
stable/11/sys/modules/linuxkpi/Makefile
Directory Properties:
stable/11/ (props changed)
Copied and modified: stable/11/sys/compat/linuxkpi/common/include/linux/xarray.h (from r364860, head/sys/compat/linuxkpi/common/include/linux/xarray.h)
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/xarray.h Thu Aug 27 10:28:12 2020 (r364860, copy source)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/xarray.h Tue Nov 10 13:13:37 2020 (r367557)
@@ -91,4 +91,10 @@ xa_err(void *ptr)
return (PTR_ERR_OR_ZERO(ptr));
}
+static inline void
+xa_init(struct xarray *xa)
+{
+ xa_init_flags(xa, 0);
+}
+
#endif /* _LINUX_XARRAY_H_ */
Copied and modified: stable/11/sys/compat/linuxkpi/common/src/linux_xarray.c (from r364860, head/sys/compat/linuxkpi/common/src/linux_xarray.c)
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_xarray.c Thu Aug 27 10:28:12 2020 (r364860, copy source)
+++ stable/11/sys/compat/linuxkpi/common/src/linux_xarray.c Tue Nov 10 13:13:37 2020 (r367557)
@@ -79,7 +79,7 @@ static void
xa_vm_wait_locked(struct xarray *xa)
{
xa_unlock(xa);
- vm_wait(NULL);
+ vm_wait();
xa_lock(xa);
}
Modified: stable/11/sys/conf/files
==============================================================================
--- stable/11/sys/conf/files Tue Nov 10 13:10:15 2020 (r367556)
+++ stable/11/sys/conf/files Tue Nov 10 13:13:37 2020 (r367557)
@@ -4332,6 +4332,8 @@ compat/linuxkpi/common/src/linux_usb.c optional compa
compile-with "${LINUXKPI_C}"
compat/linuxkpi/common/src/linux_work.c optional compat_linuxkpi \
compile-with "${LINUXKPI_C}"
+compat/linuxkpi/common/src/linux_xarray.c optional compat_linuxkpi \
+ compile-with "${LINUXKPI_C}"
# OpenFabrics Enterprise Distribution (Infiniband)
ofed/drivers/infiniband/core/ib_addr.c optional ofed \
Modified: stable/11/sys/modules/linuxkpi/Makefile
==============================================================================
--- stable/11/sys/modules/linuxkpi/Makefile Tue Nov 10 13:10:15 2020 (r367556)
+++ stable/11/sys/modules/linuxkpi/Makefile Tue Nov 10 13:13:37 2020 (r367557)
@@ -17,7 +17,8 @@ SRCS= linux_compat.c \
linux_slab.c \
linux_tasklet.c \
linux_usb.c \
- linux_work.c
+ linux_work.c \
+ linux_xarray.c
SRCS+= ${LINUXKPI_GENSRCS}
More information about the svn-src-stable
mailing list