svn commit: r348245 - in stable/12/sys: compat/linuxkpi/common/include/linux sys

[Johannes Lundberg]

Author: johalun
Date: Fri May 24 17:14:07 2019
New Revision: 348245
URL: https://svnweb.freebsd.org/changeset/base/348245

Log:
  MFC r347596:
  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:
  stable/12/sys/compat/linuxkpi/common/include/linux/ww_mutex.h
  stable/12/sys/sys/param.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linuxkpi/common/include/linux/ww_mutex.h
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/include/linux/ww_mutex.h	Fri May 24 17:06:10 2019	(r348244)
+++ stable/12/sys/compat/linuxkpi/common/include/linux/ww_mutex.h	Fri May 24 17:14:07 2019	(r348245)
@@ -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: stable/12/sys/sys/param.h
==============================================================================
--- stable/12/sys/sys/param.h	Fri May 24 17:06:10 2019	(r348244)
+++ stable/12/sys/sys/param.h	Fri May 24 17:14:07 2019	(r348245)
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200511	/* Master, propagated to newvers */
+#define __FreeBSD_version 1200512	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,