diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-01-12 09:19:34 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-01-12 09:19:34 +0000 |
| commit | 232ebb0e4586a4e5926456b6f768b7907a45837a (patch) | |
| tree | 78adbda9f7c4d8d7d7ff015292d9a85f598148dd /sys/arch/arm64/include | |
| parent | f32909dcdc7cfe1cdf7bdb1974edbbd35ea2a126 (diff) | |
Unify <machine/mutex.h> a bit further.
`mtx_owner' becomes the first field of 'struct mutex' on i386/amd64/arm64.
ok visa@
Diffstat (limited to 'sys/arch/arm64/include')
| -rw-r--r-- | sys/arch/arm64/include/mutex.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sys/arch/arm64/include/mutex.h b/sys/arch/arm64/include/mutex.h index 5fec6284c91..c42ef1cf233 100644 --- a/sys/arch/arm64/include/mutex.h +++ b/sys/arch/arm64/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.2 2017/04/20 13:57:29 visa Exp $ */ +/* $OpenBSD: mutex.h,v 1.3 2018/01/12 09:19:33 mpi Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -24,15 +24,16 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef _MACHINE_MUTEX_H_ #define _MACHINE_MUTEX_H_ #include <sys/_lock.h> struct mutex { + volatile void *mtx_owner; int mtx_wantipl; int mtx_oldipl; - volatile void *mtx_owner; #ifdef WITNESS struct lock_object mtx_lock_obj; #endif @@ -54,15 +55,16 @@ struct mutex { #ifdef WITNESS #define MUTEX_INITIALIZER_FLAGS(ipl, name, flags) \ - { __MUTEX_IPL((ipl)), 0, NULL, MTX_LO_INITIALIZER(name, flags) } + { NULL, __MUTEX_IPL((ipl)), IPL_NONE, MTX_LO_INITIALIZER(name, flags) } #else #define MUTEX_INITIALIZER_FLAGS(ipl, name, flags) \ - { __MUTEX_IPL((ipl)), 0, NULL } + { NULL, __MUTEX_IPL((ipl)), IPL_NONE } #endif void __mtx_init(struct mutex *, int); #define _mtx_init(mtx, ipl) __mtx_init((mtx), __MUTEX_IPL((ipl))) +#ifdef DIAGNOSTIC #define MUTEX_ASSERT_LOCKED(mtx) do { \ if ((mtx)->mtx_owner != curcpu()) \ panic("mutex %p not held in %s", (mtx), __func__); \ @@ -72,8 +74,12 @@ void __mtx_init(struct mutex *, int); if ((mtx)->mtx_owner == curcpu()) \ panic("mutex %p held in %s", (mtx), __func__); \ } while (0) +#else +#define MUTEX_ASSERT_LOCKED(mtx) do { } while (0) +#define MUTEX_ASSERT_UNLOCKED(mtx) do { } while (0) +#endif #define MUTEX_LOCK_OBJECT(mtx) (&(mtx)->mtx_lock_obj) #define MUTEX_OLDIPL(mtx) (mtx)->mtx_oldipl -#endif +#endif /* _MACHINE_MUTEX_H_ */ |