sleep(9) was removed aeons ago according to miod, so remove references

to it.  Because man pages are named after functions (at least they
should be) and sleep(9) doesn't exist anymore, sleep.9 is renamed to
tsleep.9.

Input and reminders from jmc and ratchov.

8 files changed, 29 insertions, 46 deletions

diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 014a2484e8b..d04af421c68 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.129 2007/06/16 13:21:44 damien Exp $
+#	$OpenBSD: Makefile,v 1.130 2007/09/14 16:16:08 mk Exp $
 #	$NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
@@ -22,7 +22,7 @@ MAN=	altq.9 aml_evalnode.9 atomic.9 audio.9 autoconf.9 bio_register.9 \
 	pool.9 powerhook_establish.9 ppsratecheck.9 printf.9 psignal.9 \
 	radio.9 random.9 rasops.9 ratecheck.9 resettodr.9 rssadapt.9 rwlock.9 \
 	sensor_attach.9 \
-	shutdownhook_establish.9 sleep.9 spl.9 startuphook_establish.9 \
+	shutdownhook_establish.9 tsleep.9 spl.9 startuphook_establish.9 \
 	style.9 syscall.9 systrace.9 sysctl_int.9 \
 	tc_init.9 time.9 timeout.9 tvtohz.9 uiomove.9 uvm.9 vfs.9 vfs_busy.9 \
 	vfs_cache.9 vaccess.9 vclean.9 vcount.9 vdevgone.9 vfinddev.9 vflush.9 \
@@ -268,7 +268,7 @@ MLINKS+=sensor_attach.9 sensordev_install.9 \
 	sensor_attach.9 sensor_task_register.9 \
 	sensor_attach.9 sensor_task_unregister.9
 MLINKS+=shutdownhook_establish.9 shutdownhook_disestablish.9
-MLINKS+=sleep.9 tsleep.9 sleep.9 wakeup.9
+MLINKS+=tsleep.9 wakeup.9
 MLINKS+=spl.9 spl0.9 spl.9 splassert.9 spl.9 splbio.9 spl.9 splclock.9 \
 	spl.9 splhigh.9 spl.9 spllowersoftclock.9 \
 	spl.9 splnet.9 spl.9 splsched.9 spl.9 splserial.9 spl.9 splsoftclock.9 \
diff --git a/share/man/man9/autoconf.9 b/share/man/man9/autoconf.9
index 4f3e415bc31..d209a525f9b 100644
--- a/share/man/man9/autoconf.9
+++ b/share/man/man9/autoconf.9
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: autoconf.9,v 1.8 2007/05/31 19:20:00 jmc Exp $
+.\"     $OpenBSD: autoconf.9,v 1.9 2007/09/14 16:16:08 mk Exp $
 .\"     $NetBSD: autoconf.9,v 1.9 2002/02/13 08:18:35 ross Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 14 2007 $
 .Dt AUTOCONF 9
 .Os
 .Sh NAME
@@ -288,7 +288,7 @@ The
 function returns zero if successful and an error code otherwise.
 .Fn config_detach
 is always called from process context, allowing
-.Xr sleep 9
+.Xr tsleep 9
 to be called while the device detaches itself (to deal with processes
 which have a device open).
 .Sh DEVICE ACTIVATION/DEACTIVATION
diff --git a/share/man/man9/ctxsw.9 b/share/man/man9/ctxsw.9
index 9c050b0b7a8..5e48791e9e0 100644
--- a/share/man/man9/ctxsw.9
+++ b/share/man/man9/ctxsw.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctxsw.9,v 1.11 2007/05/31 19:20:00 jmc Exp $
+.\"	$OpenBSD: ctxsw.9,v 1.12 2007/09/14 16:16:08 mk Exp $
 .\"	$NetBSD: ctxsw.9,v 1.9 1999/03/06 22:09:29 mycroft Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 14 2007 $
 .Dt CTXSW 9
 .Os
 .Sh NAME
@@ -62,8 +62,6 @@ can be enumerated as follows:
 .Bl -enum -offset indent
 .It
 From within
-.Xr sleep 9
-and
 .Xr tsleep 9
 when the current process
 voluntarily relinquishes the CPU to wait for some resource to become
diff --git a/share/man/man9/delay.9 b/share/man/man9/delay.9
index a4260d70c83..e5cd7be0e2f 100644
--- a/share/man/man9/delay.9
+++ b/share/man/man9/delay.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: delay.9,v 1.3 2007/05/31 19:20:00 jmc Exp $
+.\"	$OpenBSD: delay.9,v 1.4 2007/09/14 16:16:08 mk Exp $
 .\"
 .\" Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
 .\"
@@ -14,7 +14,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: May 31 2007 $
+.Dd $Mdocdate: September 14 2007 $
 .Dt DELAY 9
 .Os
 .Sh NAME
@@ -31,5 +31,5 @@ The
 .Fa delay
 argument specifies the period of time to wait for, in microseconds.
 .Sh SEE ALSO
-.Xr sleep 9 ,
-.Xr timeout 9
+.Xr timeout 9 ,
+.Xr tsleep 9
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 08fdecdc4b2..ea82760040f 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: mbuf.9,v 1.27 2007/08/10 14:53:25 henning Exp $
+.\"     $OpenBSD: mbuf.9,v 1.28 2007/09/14 16:16:08 mk Exp $
 .\"
 .\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jjbg@openbsd.org>
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 10 2007 $
+.Dd $Mdocdate: September 14 2007 $
 .Dt MBUF 9
 .Os
 .Sh NAME
@@ -384,7 +384,7 @@ If the
 argument is
 .Fa M_WAITOK ,
 the function may call
-.Xr sleep 9
+.Xr tsleep 9
 to await resources.
 If
 .Fa how
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index d294b001b77..29a4cd4d1b7 100644
--- a/share/man/man9/spl.9
+++ b/share/man/man9/spl.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spl.9,v 1.22 2007/05/31 19:20:01 jmc Exp $
+.\"	$OpenBSD: spl.9,v 1.23 2007/09/14 16:16:08 mk Exp $
 .\"	$NetBSD: spl.9,v 1.1 1997/03/11 06:15:05 mikel Exp $
 .\"
 .\" Copyright (c) 1997 Michael Long.
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 14 2007 $
 .Dt SPL 9
 .Os
 .Sh NAME
@@ -112,20 +112,18 @@ must block everything that
 .Fn splstatclock
 does.
 Code running at or above this level may not call
-.Fn sleep ,
-.Fn tsleep ,
+.Xr tsleep 9
 or
-.Fn wakeup ,
+.Xr wakeup 9 ,
 nor may it post signals.
 Note that "running" means invoked by an interrupt handler that
 operates at this level or higher.
 Kernel code that operates in the context of a process and has called
 .Fn splhigh
 for blocking purposes can use
-.Fn sleep ,
-.Fn tsleep ,
+.Xr tsleep 9
 or
-.Fn wakeup .
+.Xr wakeup 9 .
 .It Fn splclock
 blocks the hardware clock interrupt.
 It is used by
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index 0be1c58f549..00c5c4d9735 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timeout.9,v 1.24 2007/05/31 19:20:01 jmc Exp $
+.\"	$OpenBSD: timeout.9,v 1.25 2007/09/14 16:16:08 mk Exp $
 .\"
 .\" Copyright (c) 2000 Artur Grabowski <art@openbsd.org>
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 14 2007 $
 .Dt TIMEOUT 9
 .Os
 .Sh NAME
@@ -151,6 +151,6 @@ These functions are implemented in the file
 .Sh SEE ALSO
 .Xr hz 9 ,
 .Xr hzto 9 ,
-.Xr sleep 9 ,
 .Xr splclock 9 ,
+.Xr tsleep 9 ,
 .Xr tvtohz 9
diff --git a/share/man/man9/sleep.9 b/share/man/man9/tsleep.9
index d7791401a78..bfd09213fcc 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/tsleep.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sleep.9,v 1.6 2007/05/31 19:20:01 jmc Exp $
+.\"	$OpenBSD: tsleep.9,v 1.1 2007/09/14 16:16:08 mk Exp $
 .\"	$NetBSD: sleep.9,v 1.11 1999/03/24 06:15:12 mycroft Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,11 +35,10 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt SLEEP 9
+.Dd $Mdocdate: September 14 2007 $
+.Dt TSLEEP 9
 .Os
 .Sh NAME
-.Nm sleep ,
 .Nm tsleep ,
 .Nm wakeup
 .Nd process context sleep and wakeup
@@ -49,15 +48,11 @@
 .Ft int
 .Fn "tsleep" "void *ident" "int priority" "const char *wmesg" "int timo"
 .Ft void
-.Fn "sleep" "void *ident" "int priority"
-.Ft void
 .Fn "wakeup" "void *ident"
 .Sh DESCRIPTION
 These functions implement voluntary context switching.
 .Fn tsleep
-and
-.Fn sleep
-are used throughout the kernel whenever processing in the current context
+is used throughout the kernel whenever processing in the current context
 can not continue for any of the following reasons:
 .Bl -bullet -offset indent
 .It
@@ -133,21 +128,13 @@ will return
 .El
 .Pp
 The
-.Fn sleep
-function puts the process in an uninterruptible sleep.
-It is functionally equivalent to:
-.Bd -literal -offset indent
-tsleep(ident, priority & PRIMASK, 0, 0)
-.Ed
-.Pp
-The
 .Fn wakeup
 function will mark all processes which are currently sleeping on the identifier
 .Fa ident
 as runnable.
 Eventually, each of the processes will resume execution in the kernel
 context, causing a return from
-.Fn [t]sleep .
+.Fn tsleep .
 Note that processes returning from sleep should always re-evaluate the
 conditions that blocked them, since a call to
 .Fn wakeup