summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_prf.c
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2005-09-20 09:55:36 +0000
committerrwatson <rwatson@FreeBSD.org>2005-09-20 09:55:36 +0000
commit8448d393fa29035f10fb826d685e9b2cc5d6171d (patch)
tree829b99ed58f15c787b00e641a1df52235ac97096 /sys/kern/subr_prf.c
parent76edcb75f859368f044c7e7e3cc89d40b2f7a737 (diff)
downloadFreeBSD-src-8448d393fa29035f10fb826d685e9b2cc5d6171d.zip
FreeBSD-src-8448d393fa29035f10fb826d685e9b2cc5d6171d.tar.gz
Correct an incorrect comment from the dawn of time: neither tprintf()
nor uprintf() is believed to perform tsleep() or msleep() as written, as ttycheckoutq() is called with '0' as its sleep argument. Remove recently added WITNESS warnings for sleep as the comment was incorrect. This should silence a warning from the nfs_timer() code. Discussed with: bde
Diffstat (limited to 'sys/kern/subr_prf.c')
-rw-r--r--sys/kern/subr_prf.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index a457ee9..04bdb6d 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -117,8 +117,6 @@ tablefull(const char *tab)
/*
* Uprintf prints to the controlling terminal for the current process.
- * It may block if the tty queue is overfull. No message is printed if
- * the queue does not clear in a reasonable time.
*/
int
uprintf(const char *fmt, ...)
@@ -130,9 +128,6 @@ uprintf(const char *fmt, ...)
int retval;
GIANT_REQUIRED;
-
- WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "uprintf");
-
if (td == NULL || td == PCPU_GET(idlethread))
return (0);
@@ -157,8 +152,8 @@ uprintf(const char *fmt, ...)
}
/*
- * tprintf prints on the controlling terminal associated
- * with the given session, possibly to the log as well.
+ * tprintf prints on the controlling terminal associated with the given
+ * session, possibly to the log as well.
*/
void
tprintf(struct proc *p, int pri, const char *fmt, ...)
@@ -170,9 +165,6 @@ tprintf(struct proc *p, int pri, const char *fmt, ...)
struct session *sess = NULL;
GIANT_REQUIRED;
-
- WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "tprintf");
-
if (pri != -1)
flags |= TOLOG;
if (p != NULL) {
OpenPOWER on IntegriCloud