remove the mtx_enter_try() bits until the code goes back in;

ok weingart

2 files changed, 4 insertions, 14 deletions

diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index b25798c1a64..004154ca716 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.152 2009/04/25 20:14:42 weingart Exp $
+#	$OpenBSD: Makefile,v 1.153 2009/05/11 19:49:25 jmc Exp $
 #	$NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
@@ -219,8 +219,7 @@ MLINKS+=microtime.9 getmicrotime.9 microtime.9 microuptime.9 \
 	microtime.9 getnanouptime.9 microtime.9 bintime.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_enter_try.9 \
-	mutex.9 mtx_leave.9
+MLINKS+=mutex.9 mtx_init.9 mutex.9 mtx_enter.9 mutex.9 mtx_leave.9
 MLINKS+=namei.9 lookup.9 namei.9 relookup.9 namei.9 NDINIT.9
 MLINKS+=pci_conf_read.9 pci_conf_write.9 pci_conf_read.9 pci_make_tag.9 \
 	pci_conf_read.9 pci_decompose_tag.9
diff --git a/share/man/man9/mutex.9 b/share/man/man9/mutex.9
index f10b2992700..4c8f5a21c6f 100644
--- a/share/man/man9/mutex.9
+++ b/share/man/man9/mutex.9
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mutex.9,v 1.8 2009/04/25 20:14:42 weingart Exp $
+.\" $OpenBSD: mutex.9,v 1.9 2009/05/11 19:49:25 jmc Exp $
 .\"
 .\" Copyright (c) 2005 Pedro Martelletto <pedro@ambientworks.net>
 .\" All rights reserved.
@@ -15,14 +15,13 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 25 2009 $
+.Dd $Mdocdate: May 11 2009 $
 .Dt MUTEX 9
 .Os
 .Sh NAME
 .Nm mutex ,
 .Nm mtx_init ,
 .Nm mtx_enter ,
-.Nm mtx_enter_try ,
 .Nm mtx_leave
 .Nd interface to CPU mutexes
 .Sh SYNOPSIS
@@ -31,8 +30,6 @@
 .Fn mtx_init "struct mutex *mtxp" "int wantipl"
 .Ft void
 .Fn mtx_enter "struct mutex *mtxp"
-.Ft int
-.Fn mtx_enter_try "struct mutex *mtxp"
 .Ft void
 .Fn mtx_leave "struct mutex *mtxp"
 .Sh DESCRIPTION
@@ -55,12 +52,6 @@ The
 function acquires a mutex, spinning if necessary.
 .Pp
 The
-.Fn mtx_enter_try
-function tries to acquire a mutex.
-On success it will return a non-zero value, zero on failure.
-It is recommended that this function only be used if absolutely necessary.
-.Pp
-The
 .Fn mtx_leave
 function releases a mutex.
 In case the acquisition of the mutex caused the interrupt level to be changed,