git: 8965b3033ea1 - main - callout(9): adopt old references to timeout(9)

The branch main has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=8965b3033ea1750f2e064a130cf2f2158c6fc795

commit 8965b3033ea1750f2e064a130cf2f2158c6fc795
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-03-20 20:00:24 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-03-20 20:12:12 +0000

    callout(9): adopt old references to timeout(9)
    
    timeout(9) was removed a couple of years ago; all consumers now use the
    callout(9) interface.
    
    Explicitly do not bump .Dd anywhere, as this is not a content or
    semantic change.
    
    Reviewed by:    markj, jhb, Pau Amma <pauamma@gundo.com>
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D39136
---
 share/man/man9/condvar.9    | 4 ++--
 share/man/man9/epoch.9      | 4 ++--
 share/man/man9/locking.9    | 4 ++--
 share/man/man9/sleep.9      | 4 ++--
 share/man/man9/sleepqueue.9 | 4 ++--
 share/man/man9/tvtohz.9     | 4 ++--
 sys/kern/kern_timeout.c     | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/share/man/man9/condvar.9 b/share/man/man9/condvar.9
index 4a4e8741eda0..3e02f2fa40c0 100644
--- a/share/man/man9/condvar.9
+++ b/share/man/man9/condvar.9
@@ -251,11 +251,11 @@ will fail if:
 Timeout expired.
 .El
 .Sh SEE ALSO
+.Xr callout 9 ,
 .Xr locking 9 ,
 .Xr mtx_pool 9 ,
 .Xr mutex 9 ,
 .Xr rwlock 9 ,
 .Xr sema 9 ,
 .Xr sleep 9 ,
-.Xr sx 9 ,
-.Xr timeout 9
+.Xr sx 9
diff --git a/share/man/man9/epoch.9 b/share/man/man9/epoch.9
index 1f191211b041..8a5008a6b238 100644
--- a/share/man/man9/epoch.9
+++ b/share/man/man9/epoch.9
@@ -267,14 +267,14 @@ The
 .Nm
 kernel programming interface is under development and is subject to change.
 .Sh SEE ALSO
+.Xr callout 9 ,
 .Xr locking 9 ,
 .Xr mtx_pool 9 ,
 .Xr mutex 9 ,
 .Xr rwlock 9 ,
 .Xr sema 9 ,
 .Xr sleep 9 ,
-.Xr sx 9 ,
-.Xr timeout 9
+.Xr sx 9
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9
index e1e4ccd33664..64cba3b0159b 100644
--- a/share/man/man9/locking.9
+++ b/share/man/man9/locking.9
@@ -422,6 +422,7 @@ At this time this is a rather easy to remember table.
 .Xr witness 4 ,
 .Xr atomic 9 ,
 .Xr BUS_SETUP_INTR 9 ,
+.Xr callout 9 ,
 .Xr condvar 9 ,
 .Xr epoch 9 ,
 .Xr lock 9 ,
@@ -433,7 +434,6 @@ At this time this is a rather easy to remember table.
 .Xr sema 9 ,
 .Xr sleep 9 ,
 .Xr smr 9 ,
-.Xr sx 9 ,
-.Xr timeout 9
+.Xr sx 9
 .Sh BUGS
 There are too many locking primitives to choose from.
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index 78625e5e1184..1a471bcfc00d 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -366,13 +366,13 @@ A non-zero timeout was specified and the timeout expired.
 .El
 .Sh SEE ALSO
 .Xr ps 1 ,
+.Xr callout 9 ,
 .Xr locking 9 ,
 .Xr malloc 9 ,
 .Xr mi_switch 9 ,
 .Xr mtx_sleep 9 ,
 .Xr rw_sleep 9 ,
-.Xr sx_sleep 9 ,
-.Xr timeout 9
+.Xr sx_sleep 9
 .Sh HISTORY
 The functions
 .Fn sleep
diff --git a/share/man/man9/sleepqueue.9 b/share/man/man9/sleepqueue.9
index 64dfc3bdee55..ae3bbaab7460 100644
--- a/share/man/man9/sleepqueue.9
+++ b/share/man/man9/sleepqueue.9
@@ -383,8 +383,8 @@ interfaces.
 Almost all other code in the kernel should use one of those interfaces rather
 than manipulating sleep queues directly.
 .Sh SEE ALSO
+.Xr callout 9 ,
 .Xr condvar 9 ,
 .Xr runqueue 9 ,
 .Xr scheduler 9 ,
-.Xr sleep 9 ,
-.Xr timeout 9
+.Xr sleep 9
diff --git a/share/man/man9/tvtohz.9 b/share/man/man9/tvtohz.9
index cf07d603a790..d3918bdb85c6 100644
--- a/share/man/man9/tvtohz.9
+++ b/share/man/man9/tvtohz.9
@@ -45,9 +45,9 @@ of system ticks that would elapse.
 Returns the integral number of system ticks expected to elapse in the given
 interval, including the current tick.
 .Sh SEE ALSO
+.Xr callout 9 ,
 .Xr microtime 9 ,
-.Xr microuptime 9 ,
-.Xr timeout 9
+.Xr microuptime 9
 .Sh HISTORY
 The
 .Nm
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 0ac0eca36da4..05497f3d46d7 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -728,7 +728,7 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc,
 		if (lastfunc != c_func || sbt2 > maxdt * 2) {
 			ts2 = sbttots(sbt2);
 			printf(
-		"Expensive timeout(9) function: %p(%p) %jd.%09ld s\n",
+		"Expensive callout(9) function: %p(%p) %jd.%09ld s\n",
 			    c_func, c_arg, (intmax_t)ts2.tv_sec, ts2.tv_nsec);
 		}
 		maxdt = sbt2;