svn commit: r347596 - in head/sys: compat/linuxkpi/common/include/linux sys
Johannes Lundberg
johalun at FreeBSD.org
Tue May 14 23:21:22 UTC 2019
Author: johalun
Date: Tue May 14 23:21:20 2019
New Revision: 347596
URL: https://svnweb.freebsd.org/changeset/base/347596
Log:
LinuxKPI: Add context member to ww_mutex and bump FreeBSD version.
This patch is part of https://reviews.freebsd.org/D19565.
Reviewed by: hps
Approved by: imp (mentor), hps
Modified:
head/sys/compat/linuxkpi/common/include/linux/ww_mutex.h
head/sys/sys/param.h
Modified: head/sys/compat/linuxkpi/common/include/linux/ww_mutex.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/ww_mutex.h Tue May 14 23:20:16 2019 (r347595)
+++ head/sys/compat/linuxkpi/common/include/linux/ww_mutex.h Tue May 14 23:21:20 2019 (r347596)
@@ -45,6 +45,7 @@ struct ww_acquire_ctx {
struct ww_mutex {
struct mutex base;
struct cv condvar;
+ struct ww_acquire_ctx *ctx;
};
#define DEFINE_WW_CLASS(name) \
Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h Tue May 14 23:20:16 2019 (r347595)
+++ head/sys/sys/param.h Tue May 14 23:21:20 2019 (r347596)
@@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1300025 /* Master, propagated to newvers */
+#define __FreeBSD_version 1300026 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
More information about the svn-src-all
mailing list