diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man9/Makefile | 5 | ||||
| -rw-r--r-- | share/man/man9/mutex.9 | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 38f877256bb..aa3842c0444 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.189 2013/11/28 14:54:18 syl Exp $ +# $OpenBSD: Makefile,v 1.190 2013/12/09 03:14:30 dlg Exp $ # $NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -236,7 +236,8 @@ MLINKS+=microtime.9 getmicrotime.9 microtime.9 microuptime.9 \ microtime.9 binuptime.9 MLINKS+=mountroothook_establish.9 mountroothook_disestablish.9 MLINKS+=mutex.9 mtx_init.9 mutex.9 mtx_enter.9 mutex.9 mtx_leave.9 \ - mutex.9 MUTEX_ASSERT_LOCKED.9 mutex.9 MUTEX_ASSERT_UNLOCKED.9 + mutex.9 MUTEX_ASSERT_LOCKED.9 mutex.9 MUTEX_ASSERT_UNLOCKED.9 \ + mutex.9 MUTEX_INITIALIZER.9 MLINKS+=mutex.9 mtx_enter_try.9 MLINKS+=namei.9 vfs_lookup.9 namei.9 vfs_relookup.9 namei.9 NDINIT.9 MLINKS+=namei.9 NDINITAT.9 diff --git a/share/man/man9/mutex.9 b/share/man/man9/mutex.9 index 82a6fedd328..b5f13f61c3b 100644 --- a/share/man/man9/mutex.9 +++ b/share/man/man9/mutex.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mutex.9,v 1.16 2013/07/17 20:21:54 schwarze Exp $ +.\" $OpenBSD: mutex.9,v 1.17 2013/12/09 03:14:30 dlg Exp $ .\" .\" Copyright (c) 2005 Pedro Martelletto <pedro@ambientworks.net> .\" All rights reserved. @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 17 2013 $ +.Dd $Mdocdate: December 9 2013 $ .Dt MUTEX 9 .Os .Sh NAME @@ -37,6 +37,7 @@ .Fn mtx_leave "struct mutex *mtxp" .Fn MUTEX_ASSERT_LOCKED "struct mutex *mtxp" .Fn MUTEX_ASSERT_UNLOCKED "struct mutex *mtxp" +.Fn MUTEX_INITIALIZER "int wantipl" .Sh DESCRIPTION The .Nm @@ -74,6 +75,14 @@ and .Fn MUTEX_ASSERT_UNLOCKED macros may be used to assert that a mutex is held locked or unlocked by the current CPU. +.Pp +A mutex declaration may be initialised with the +.Fn MUTEX_INITIALIZER +macro. +When acquired, the mutex will cause the processor interrupt level to be raised +to +.Fa wantipl +if necessary. .Sh SEE ALSO .Xr lockmgr 9 , .Xr rwlock 9 , |