 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.5 2019/11/29 20:05:07 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.6 2019/11/29 22:55:33 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -50,23 +50,20 @@ struct kmutex {
 			volatile uint16_t	mtxs_unused;
 		} s;
 	} u;
 	__cpu_simple_lock_t	mtx_lock;
 };
 #define	mtx_owner 			u.mtxa_owner
 #define	mtx_flags 			u.s.mtxs_flags
 #define	mtx_ipl 			u.s.mtxs_ipl
 #define	__HAVE_SIMPLE_MUTEXES		1
 #define	__HAVE_MUTEX_STUBS		1
 #define	MUTEX_RECEIVE(mtx)		__asm __volatile("mb" : : : "memory")
 #define	MUTEX_GIVE(mtx)			__asm __volatile("mb" : : : "memory")
 #define	MUTEX_CAS(p, o, n)		_lock_cas((p), (o), (n))
 int	_lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _ALPHA_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.20 2015/02/25 13:52:42 joerg Exp $	*/
+/*	$NetBSD: mutex.h,v 1.21 2019/11/29 22:55:33 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -74,47 +74,23 @@ struct kmutex {
 	} u;
 };
 #define	mtx_owner		u.mtxa_owner
 #define	mtx_ipl			u.s.mtxs_ipl
 #define	mtx_lock		u.s.mtxs_lock
 #if 0
 #define	__HAVE_MUTEX_STUBS		1
 #define	__HAVE_SPIN_MUTEX_STUBS		1
 #endif
 #define	__HAVE_SIMPLE_MUTEXES		1
 /*
  * MUTEX_{GIVE,RECEIVE}: no memory barrier is required in the UP case;
  * we're synchronizing against interrupts, not multiple processors.
  */
 #ifdef MULTIPROCESSOR
 #ifdef _ARM_ARCH_7
 #define	MUTEX_RECEIVE(mtx)		__asm __volatile("dmb" ::: "memory")
 #else
 #define	MUTEX_RECEIVE(mtx)		membar_consumer()
 #endif
 #else
 #define	MUTEX_RECEIVE(mtx)		/* nothing */
 #endif
 #ifdef MULTIPROCESSOR
 #ifdef _ARM_ARCH_7
 #define	MUTEX_GIVE(mtx)			__asm __volatile("dsb" ::: "memory")
 #else
 #define	MUTEX_GIVE(mtx)			membar_producer()
 #endif
 #else
 #define	MUTEX_GIVE(mtx)			/* nothing */
 #endif
 #define	MUTEX_CAS(p, o, n)		\
     (atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
 #ifdef MULTIPROCESSOR
 #define	MUTEX_SMT_PAUSE()		__asm __volatile("wfe")
 #define	MUTEX_SMT_WAKE()		__asm __volatile("sev")
 #endif
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _ARM_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.4 2009/07/20 04:41:37 kiyohara Exp $	*/
+/*	$NetBSD: mutex.h,v 1.5 2019/11/29 22:55:33 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Takayoshi Kochi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -46,29 +46,19 @@ struct kmutex {
 	ipl_cookie_t		mtx_ipl;
 	__cpu_simple_lock_t	mtx_lock;
 };
 /* XXX when we implement mutex_enter()/mutex_exit(), uncomment this
 #define __HAVE_MUTEX_STUBS		1
 */
 /* XXX when we implement mutex_spin_enter()/mutex_spin_exit(), uncomment this
 #define __HAVE_SPIN_MUTEX_STUBS		1
 */
 #define	__HAVE_SIMPLE_MUTEXES		1
 /*
  * MUTEX_RECEIVE: no memory barrier required, atomic_cas implies a load fence.
  */
 #define	MUTEX_RECEIVE(mtx)		/* nothing */
 /*
  * MUTEX_GIVE: no memory barrier required, as _lock_cas() will take care of it.
  */
 #define	MUTEX_GIVE(mtx)			/* nothing */
 #define	MUTEX_CAS(ptr, old, new)		\
     (atomic_cas_ulong((volatile unsigned long *)(ptr), (old), (new)) == (old))
 #endif	/* __MUTEX_PRIVATE */
 #endif	/* _IA64_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.8 2019/11/29 20:05:49 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.9 2019/11/29 22:55:33 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,22 +52,19 @@ struct kmutex {
 			__cpu_simple_lock_t	mtxs_lock;	/* 2 */
 			uint8_t			mtxs_unused;	/* 3 */
 		} s;
 	} u;
 };
 #define	mtx_owner		u.mtxu_owner
 #define	mtx_ipl			u.s.mtxs_ipl
 #define	mtx_lock		u.s.mtxs_lock
 #define	__HAVE_SIMPLE_MUTEXES		1
 #define	__HAVE_MUTEX_STUBS		1
 #define	MUTEX_RECEIVE(mtx)		__insn_barrier()
 #define	MUTEX_GIVE(mtx)			__insn_barrier()
 #define	MUTEX_CAS(p, o, n)		(atomic_cas_uint((p), (o), (n)) == (o))
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _M68K_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.7 2011/02/20 07:45:47 matt Exp $	*/
+/*	$NetBSD: mutex.h,v 1.8 2019/11/29 22:55:33 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -45,23 +45,20 @@ struct kmutex {
 #include <machine/lock.h>
 #endif
 struct kmutex {
 	volatile uintptr_t	mtx_owner;
 	ipl_cookie_t		mtx_ipl;
 	__cpu_simple_lock_t	mtx_lock;
 };
 #define	__HAVE_SIMPLE_MUTEXES		1
 #define	__HAVE_MUTEX_STUBS		1
 #define	__HAVE_SPIN_MUTEX_STUBS		1
 #define	MUTEX_RECEIVE(mtx)		membar_enter()
 #define	MUTEX_GIVE(mtx)			membar_exit()
 #define	MUTEX_CAS(p, o, n)		\
     (atomic_cas_ulong((volatile u_long *)(p), (o), (n)) == (o))
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _MIPS_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
+/*	$NetBSD: mutex.h,v 1.2 2019/11/29 22:55:33 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,38 +60,19 @@ struct kmutex {
 	} u;
 };
 #define	mtx_owner		u.mtxa_owner
 #define	mtx_ipl			u.s.mtxs_ipl
 #define	mtx_lock		u.s.mtxs_lock
 #if 0
 #define	__HAVE_MUTEX_STUBS		1
 #define	__HAVE_SPIN_MUTEX_STUBS		1
 #endif
 #define	__HAVE_SIMPLE_MUTEXES		1
 /*
  * MUTEX_RECEIVE: no memory barrier required; we're synchronizing against
  * interrupts, not multiple processors.
  */
 #ifdef MULTIPROCESSOR
 #define	MUTEX_RECEIVE(mtx)		membar_consumer()
 #else
 #define	MUTEX_RECEIVE(mtx)		/* nothing */
 #endif
 /*
  * MUTEX_GIVE: no memory barrier required; same reason.
  */
 #ifdef MULTIPROCESSOR
 #define	MUTEX_GIVE(mtx)			membar_producer()
 #else
 #define	MUTEX_GIVE(mtx)			/* nothing */
 #endif
 #define	MUTEX_CAS(p, o, n)		\
     (atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _OR1K_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.5 2019/11/29 20:05:59 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.6 2019/11/29 22:55:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,23 +51,20 @@ struct kmutex {
 		} p;
 	} u;
 };
 #ifdef __MUTEX_PRIVATE
 #define	mtx_owner	u.m.mtxm_owner
 #define	mtx_ipl		u.m.mtxm_ipl
 #define	mtx_lock	u.m.mtxm_lock
 #define	__HAVE_SIMPLE_MUTEXES		1
 #define	__HAVE_MUTEX_STUBS		1
 #define	MUTEX_RECEIVE(mtx)		__asm __volatile("isync" ::: "memory")
 #define	MUTEX_GIVE(mtx)			__asm __volatile("sync" ::: "memory")
 #define	MUTEX_CAS(p, o, n)		_lock_cas((p), (o), (n))
 int	_lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _POWERPC_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.2 2019/06/01 12:42:28 maxv Exp $	*/
+/*	$NetBSD: mutex.h,v 1.3 2019/11/29 22:55:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -103,38 +103,19 @@ static inline void
 riscv_mutex_spinbit_lock_unlock(kmutex_t *__mtx)
+{
 	__asm __volatile(
 		"amoand" MTX_ASMOP_SFX ".rl\tx0, %0, (%1)"
 	   ::	"r"(~MTX_LOCK), "r"(__mtx));
+}
 #if 0
 #define	__HAVE_MUTEX_STUBS		1
 #define	__HAVE_SPIN_MUTEX_STUBS		1
 #endif
 #define	__HAVE_SIMPLE_MUTEXES		1
 /*
  * MUTEX_RECEIVE: no memory barrier required; we're synchronizing against
  * interrupts, not multiple processors.
  */
 #ifdef MULTIPROCESSOR
 #define	MUTEX_RECEIVE(mtx)		membar_consumer()
 #else
 #define	MUTEX_RECEIVE(mtx)		/* nothing */
 #endif
 /*
  * MUTEX_GIVE: no memory barrier required; same reason.
  */
 #ifdef MULTIPROCESSOR
 #define	MUTEX_GIVE(mtx)			membar_producer()
 #else
 #define	MUTEX_GIVE(mtx)			/* nothing */
 #endif
 #define	MUTEX_CAS(p, o, n)		\
     (atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _RISCV_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.9 2008/04/28 20:23:35 martin Exp $	*/
+/*	$NetBSD: mutex.h,v 1.10 2019/11/29 22:55:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,31 +52,20 @@ struct kmutex {
 			__cpu_simple_lock_t	mtxs_lock;
 			volatile uint8_t	mtxs_unused;
 		} s;
 	} u;
 };
 #define	mtx_owner		u.mtxa_owner
 #define	mtx_ipl			u.s.mtxs_ipl
 #define	mtx_lock		u.s.mtxs_lock
 #define	__HAVE_SIMPLE_MUTEXES		1
 #define	__HAVE_MUTEX_STUBS		1
 /*
  * MUTEX_RECEIVE: no memory barrier required; we're synchronizing against
  * interrupts, not multiple processors.
  */
 #define	MUTEX_RECEIVE(mtx)		/* nothing */
 /*
  * MUTEX_GIVE: no memory barrier required; same reason.
  */
 #define	MUTEX_GIVE(mtx)			/* nothing */
 uintptr_t	_lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
 #define	MUTEX_CAS(p, o, n)		(_lock_cas((p), (o), (n)) == (o))
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _SH3_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.10 2008/04/28 20:23:36 martin Exp $	*/
+/*	$NetBSD: mutex.h,v 1.11 2019/11/29 22:55:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -48,25 +48,22 @@ struct kmutex {
 		} s;
 #endif
 	} u;
 };
 #ifdef __MUTEX_PRIVATE
 #define	mtx_owner 			u.mtxa_owner
 #define	mtx_ipl 			u.s.mtxs_ipl
 #define	mtx_lock			u.s.mtxs_lock
 #define	__HAVE_SIMPLE_MUTEXES		1
 #define	MUTEX_RECEIVE(mtx)		/* nothing */
 #define	MUTEX_GIVE(mtx)			/* nothing */
 #define	MUTEX_CAS(p, o, n)		\
     (_atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
 unsigned long	_atomic_cas_ulong(volatile unsigned long *,
     unsigned long, unsigned long);
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _SPARC_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.5 2019/11/29 20:06:34 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.6 2019/11/29 22:55:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -45,31 +45,20 @@ struct kmutex {
 #endif
 	} u;
 };
 #ifdef __MUTEX_PRIVATE
 #define	mtx_owner 			u.mtxa_owner
 #define	mtx_ipl 			u.s.mtxs_ipl
 #define	mtx_lock			u.s.mtxs_lock
 #define __HAVE_MUTEX_STUBS		1
 #define	__HAVE_SIMPLE_MUTEXES		1
 /*
  * XXX Should this be LoadLoad|LoadStore, or does the assumption of a
  * preceding atomic r/m/w operation obviate the need for that?
  */
 #define	MUTEX_RECEIVE(mtx) __asm __volatile("membar #LoadLoad" : : : "memory")
 /*
  * MUTEX_GIVE: no memory barrier required, as _lock_cas() will take care of it.
  */
 #define	MUTEX_GIVE(mtx)			__insn_barrier()
 #define	MUTEX_CAS(p, o, n)		_lock_cas((p), (o), (n))
 int	_lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _SPARC64_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.3 2008/04/28 20:23:39 martin Exp $	*/
+/*	$NetBSD: mutex.h,v 1.4 2019/11/29 22:55:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -44,32 +44,22 @@ struct kmutex {
 		} s;
 #endif
 	} u;
 };
 #ifdef __MUTEX_PRIVATE
 #define	mtx_owner 			u.mtxa_owner
 #define	mtx_ipl 			u.s.mtxs_ipl
 #define	mtx_lock			u.s.mtxs_lock
 #define	__HAVE_SIMPLE_MUTEXES		1
 /*
  * MUTEX_RECEIVE: no memory barrier required, as 'ret' implies a load fence.
  */
 #define	MUTEX_RECEIVE(mtx)		/* nothing */
 /*
  * MUTEX_GIVE: no memory barrier required, as _lock_cas() will take care of it.
  */
 #define	MUTEX_GIVE(mtx)			/* nothing */
 #define	MUTEX_CAS(p, o, n)		\
     (_atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
 unsigned long	_atomic_cas_ulong(volatile unsigned long *,
     unsigned long, unsigned long);
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _ARCH_USERMODE_INCLUDE_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.14 2014/08/14 11:28:13 martin Exp $	*/
+/*	$NetBSD: mutex.h,v 1.15 2019/11/29 22:55:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -61,29 +61,18 @@ struct kmutex {
 			volatile uint8_t	mtxs_unused;
 		} s;
 	} u;
 };
 #define	mtx_owner		u.mtxa_owner
 #define	mtx_ipl			u.s.mtxs_ipl
 #define	mtx_lock		u.s.mtxs_lock
 #define	__HAVE_MUTEX_STUBS		1
 #define	__HAVE_SPIN_MUTEX_STUBS		1
 #define	__HAVE_SIMPLE_MUTEXES		1
 /*
  * MUTEX_RECEIVE: no memory barrier required; we're synchronizing against
  * interrupts, not multiple processors.
  */
 #define	MUTEX_RECEIVE(mtx)	/* nothing */
 /*
  * MUTEX_GIVE: no memory barrier required; same reason.
  */
 #define	MUTEX_GIVE(mtx)		/* nothing */
 #define	MUTEX_CAS(p, o, n)	(atomic_cas_ulong((p), (o), (n)) == (o))
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _VAX_MUTEX_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.6 2009/04/24 17:49:51 ad Exp $	*/
+/*	$NetBSD: mutex.h,v 1.7 2019/11/29 22:55:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -46,35 +46,22 @@ struct kmutex {
 	} u;
 };
 #ifdef __MUTEX_PRIVATE
 #define	mtx_owner 			u.mtxa_owner
 #define	mtx_ipl 			u.s.mtxs_ipl
 #define	mtx_lock			u.s.mtxs_lock
 #define __HAVE_MUTEX_STUBS		1
 #define __HAVE_SPIN_MUTEX_STUBS		1
 #define	__HAVE_SIMPLE_MUTEXES		1
 /*
  * MUTEX_RECEIVE: technically, no memory barrier is required
  * as 'ret' implies a load fence.  However we need this to
  * handle a bug with some Opteron revisions.  See patch.c,
  * lock_stubs.S.
  */
 #define	MUTEX_RECEIVE(mtx)		membar_consumer()
 /*
  * MUTEX_GIVE: no memory barrier required, as _lock_cas() will take care of it.
  */
 #define	MUTEX_GIVE(mtx)			/* nothing */
 #define	MUTEX_CAS(p, o, n)		\
     (_atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
 unsigned long	_atomic_cas_ulong(volatile unsigned long *,
     unsigned long, unsigned long);
 #endif	/* __MUTEX_PRIVATE */
 #endif /* _X86_MUTEX_H_ */