From 395be823fdfb4b1d268ce5d628120a2614e956f4 Mon Sep 17 00:00:00 2001 From: Johannes Lundberg Date: Tue, 14 May 2019 23:21:20 +0000 Subject: [PATCH] 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 --- sys/compat/linuxkpi/common/include/linux/ww_mutex.h | 1 + sys/sys/param.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ww_mutex.h b/sys/compat/linuxkpi/common/include/linux/ww_mutex.h index 0c816f19889..c23d4dd6fa2 100644 --- a/sys/compat/linuxkpi/common/include/linux/ww_mutex.h +++ b/sys/compat/linuxkpi/common/include/linux/ww_mutex.h @@ -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) \ diff --git a/sys/sys/param.h b/sys/sys/param.h index 04d10e00c72..84be4be3601 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -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,