summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>1996-10-13 02:32:29 +0000
committerchristos <christos@NetBSD.org>1996-10-13 02:32:29 +0000
commitf443b89c92af9e7bc800f4f3cb2cfa69ec0cc7f5 (patch)
tree3b4c4488d6b508a9153da9e4796e922b8ac7dd87 /sys
parente44c1d1f336ae4f7f9d4139bd2d644a5ab9ff3a6 (diff)
backout previous kprintf change
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/exec_script.c4
-rw-r--r--sys/kern/init_main.c12
-rw-r--r--sys/kern/kern_lkm.c18
-rw-r--r--sys/kern/kern_malloc.c8
-rw-r--r--sys/kern/kern_proc.c8
-rw-r--r--sys/kern/kern_sig.c8
-rw-r--r--sys/kern/kern_synch.c4
-rw-r--r--sys/kern/kern_xxx.c24
-rw-r--r--sys/kern/subr_autoconf.c10
-rw-r--r--sys/kern/subr_disk.c8
-rw-r--r--sys/kern/subr_extent.c36
-rw-r--r--sys/kern/subr_prf.c40
-rw-r--r--sys/kern/subr_prof.c6
-rw-r--r--sys/kern/subr_rmap.c6
-rw-r--r--sys/kern/sysv_msg.c4
-rw-r--r--sys/kern/sysv_sem.c6
-rw-r--r--sys/kern/tty.c4
-rw-r--r--sys/kern/tty_subr.c6
-rw-r--r--sys/kern/uipc_socket2.c6
-rw-r--r--sys/kern/vfs_bio.c8
-rw-r--r--sys/kern/vfs_cluster.c6
-rw-r--r--sys/kern/vfs_init.c10
-rw-r--r--sys/kern/vfs_lockf.c40
-rw-r--r--sys/kern/vfs_lookup.c10
-rw-r--r--sys/kern/vfs_subr.c32
25 files changed, 162 insertions, 162 deletions
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c
index 08da08991f6..a0c46a039f0 100644
--- a/sys/kern/exec_script.c
+++ b/sys/kern/exec_script.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_script.c,v 1.15 1996/10/10 22:46:11 christos Exp $ */
+/* $NetBSD: exec_script.c,v 1.16 1996/10/13 02:32:29 christos Exp $ */
/*
* Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -213,7 +213,7 @@ check_shell:
#endif
#ifdef FDSCRIPTS
} else
- ksprintf(*tmpsap++, "/dev/fd/%d", epp->ep_fd);
+ sprintf(*tmpsap++, "/dev/fd/%d", epp->ep_fd);
#endif
*tmpsap = NULL;
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 7f2115a9e49..ad05c9d37fe 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.89 1996/10/10 22:46:12 christos Exp $ */
+/* $NetBSD: init_main.c,v 1.90 1996/10/13 02:32:30 christos Exp $ */
/*
* Copyright (c) 1995 Christopher G. Demetriou. All rights reserved.
@@ -174,7 +174,7 @@ main(framep)
* in case of early panic or other messages.
*/
consinit();
- kprintf(copyright);
+ printf(copyright);
vm_mem_init();
kmeminit();
@@ -454,7 +454,7 @@ start_init(p)
*flagsp++ = '\0';
i = flagsp - flags;
#ifdef DEBUG
- kprintf("init: copying out flags `%s' %d\n", flags, i);
+ printf("init: copying out flags `%s' %d\n", flags, i);
#endif
(void)copyout((caddr_t)flags, (caddr_t)(ucp -= i), i);
arg1 = ucp;
@@ -465,7 +465,7 @@ start_init(p)
*/
i = strlen(path) + 1;
#ifdef DEBUG
- kprintf("init: copying out path `%s' %d\n", path, i);
+ printf("init: copying out path `%s' %d\n", path, i);
#endif
(void)copyout((caddr_t)path, (caddr_t)(ucp -= i), i);
arg0 = ucp;
@@ -493,9 +493,9 @@ start_init(p)
if ((error = sys_execve(p, &args, retval)) == 0)
return;
if (error != ENOENT)
- kprintf("exec %s: error %d\n", path, error);
+ printf("exec %s: error %d\n", path, error);
}
- kprintf("init: not found\n");
+ printf("init: not found\n");
panic("no init");
}
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index e44f3f3f891..a91e413e460 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lkm.c,v 1.35 1996/10/10 22:46:13 christos Exp $ */
+/* $NetBSD: kern_lkm.c,v 1.36 1996/10/13 02:32:31 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -164,7 +164,7 @@ lkmclose(dev, flag, mode, p)
if (!(lkm_v & LKM_ALLOC)) {
#ifdef DEBUG
- kprintf("LKM: close before open!\n");
+ printf("LKM: close before open!\n");
#endif /* DEBUG */
return (EBADF);
}
@@ -239,8 +239,8 @@ lkmioctl(dev, cmd, data, flag, p)
resrvp->addr = curp->area; /* ret kernel addr */
#ifdef DEBUG
- kprintf("LKM: LMRESERV (actual = 0x%08lx)\n", curp->area);
- kprintf("LKM: LMRESERV (adjusted = 0x%08lx)\n",
+ printf("LKM: LMRESERV (actual = 0x%08lx)\n", curp->area);
+ printf("LKM: LMRESERV (adjusted = 0x%08lx)\n",
trunc_page(curp->area));
#endif /* DEBUG */
lkm_state = LKMS_RESERVED;
@@ -272,13 +272,13 @@ lkmioctl(dev, cmd, data, flag, p)
if ((curp->offset + i) < curp->size) {
lkm_state = LKMS_LOADING;
#ifdef DEBUG
- kprintf("LKM: LMLOADBUF (loading @ %ld of %ld, i = %d)\n",
+ printf("LKM: LMLOADBUF (loading @ %ld of %ld, i = %d)\n",
curp->offset, curp->size, i);
#endif /* DEBUG */
} else {
lkm_state = LKMS_LOADED;
#ifdef DEBUG
- kprintf("LKM: LMLOADBUF (loaded)\n");
+ printf("LKM: LMLOADBUF (loaded)\n");
#endif /* DEBUG */
}
curp->offset += i;
@@ -293,7 +293,7 @@ lkmioctl(dev, cmd, data, flag, p)
lkmunreserve(); /* coerce state to LKM_IDLE */
#ifdef DEBUG
- kprintf("LKM: LMUNRESERV\n");
+ printf("LKM: LMUNRESERV\n");
#endif /* DEBUG */
break;
@@ -315,7 +315,7 @@ lkmioctl(dev, cmd, data, flag, p)
default:
#ifdef DEBUG
- kprintf("lkm_state is %02x\n", lkm_state);
+ printf("lkm_state is %02x\n", lkm_state);
#endif /* DEBUG */
return ENXIO;
}
@@ -338,7 +338,7 @@ lkmioctl(dev, cmd, data, flag, p)
curp->used = 1;
#ifdef DEBUG
- kprintf("LKM: LMREADY\n");
+ printf("LKM: LMREADY\n");
#endif /* DEBUG */
lkm_state = LKMS_IDLE;
break;
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index e3ebec1caed..f54fd7d1fa7 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.21 1996/10/10 22:46:15 christos Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.22 1996/10/13 02:32:32 christos Exp $ */
/*
* Copyright 1996 Christopher G. Demetriou. All rights reserved.
@@ -210,7 +210,7 @@ malloc(size, type, flags)
memname[freep->type] : "???";
if (kbp->kb_next &&
!kernacc(kbp->kb_next, sizeof(struct freelist), 0)) {
- kprintf(
+ printf(
"%s %ld of object %p size %ld %s %s (invalid addr %p)\n",
"Data modified on freelist: word",
(long)((int32_t *)&kbp->kb_next - (int32_t *)kbp),
@@ -235,7 +235,7 @@ malloc(size, type, flags)
for (lp = (int32_t *)va; lp < end; lp++) {
if (*lp == WEIRD_ADDR)
continue;
- kprintf("%s %ld of object %p size %ld %s %s (0x%x != 0x%x)\n",
+ printf("%s %ld of object %p size %ld %s %s (0x%x != 0x%x)\n",
"Data modified on freelist: word",
(long)(lp - (int32_t *)va), va, size, "previous type",
savedtype, *lp, WEIRD_ADDR);
@@ -332,7 +332,7 @@ free(addr, type)
cp = ((struct freelist *)cp)->next) {
if (addr != cp)
continue;
- kprintf("multiply freed item %p\n", addr);
+ printf("multiply freed item %p\n", addr);
panic("free: duplicated free");
}
}
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 1527af7145b..a233ea91297 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.15 1996/10/10 22:46:17 christos Exp $ */
+/* $NetBSD: kern_proc.c,v 1.16 1996/10/13 02:32:33 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -363,15 +363,15 @@ pgrpdump()
for (i = 0; i <= pgrphash; i++) {
if ((pgrp = pgrphashtbl[i].lh_first) != NULL) {
- kprintf("\tindx %d\n", i);
+ printf("\tindx %d\n", i);
for (; pgrp != 0; pgrp = pgrp->pg_hash.le_next) {
- kprintf("\tpgrp %p, pgid %d, sess %p, sesscnt %d, mem %p\n",
+ printf("\tpgrp %p, pgid %d, sess %p, sesscnt %d, mem %p\n",
pgrp, pgrp->pg_id, pgrp->pg_session,
pgrp->pg_session->s_count,
pgrp->pg_members.lh_first);
for (p = pgrp->pg_members.lh_first; p != 0;
p = p->p_pglist.le_next) {
- kprintf("\t\tpid %d addr %p pgrp %p\n",
+ printf("\t\tpid %d addr %p pgrp %p\n",
p->p_pid, p, p->p_pgrp);
}
}
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index fb098945171..f2785647cef 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.56 1996/10/10 22:46:18 christos Exp $ */
+/* $NetBSD: kern_sig.c,v 1.57 1996/10/13 02:32:34 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -848,7 +848,7 @@ issignal(p)
* Are you sure you want to ignore SIGSEGV
* in init? XXX
*/
- kprintf("Process (pid %d) got signal %d\n",
+ printf("Process (pid %d) got signal %d\n",
p->p_pid, signum);
#endif
break; /* == ignore */
@@ -889,7 +889,7 @@ issignal(p)
*/
if ((prop & SA_CONT) == 0 &&
(p->p_flag & P_TRACED) == 0)
- kprintf("issignal\n");
+ printf("issignal\n");
break; /* == ignore */
default:
@@ -1062,7 +1062,7 @@ coredump(p)
if (USPACE + ctob(vm->vm_dsize + vm->vm_ssize) >=
p->p_rlimit[RLIMIT_CORE].rlim_cur)
return (EFAULT);
- ksprintf(name, "%s.core", p->p_comm);
+ sprintf(name, "%s.core", p->p_comm);
NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, name, p);
error = vn_open(&nd, O_CREAT | FWRITE, S_IRUSR | S_IWUSR);
if (error)
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 90ec4b05583..d30d61a4371 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.40 1996/10/10 22:46:20 christos Exp $ */
+/* $NetBSD: kern_synch.c,v 1.41 1996/10/13 02:32:35 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1991, 1993
@@ -431,7 +431,7 @@ sleep(ident, priority)
#ifdef DIAGNOSTIC
if (priority > PZERO) {
- kprintf("sleep called with priority %d > PZERO, wchan: %p\n",
+ printf("sleep called with priority %d > PZERO, wchan: %p\n",
priority, ident);
panic("old sleep");
}
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index e0775135c41..93f40954fdd 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_xxx.c,v 1.37 1996/10/10 22:46:21 christos Exp $ */
+/* $NetBSD: kern_xxx.c,v 1.38 1996/10/13 02:32:36 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -103,21 +103,21 @@ scdebug_call(p, code, args)
sy->sy_call == sys_nosys))
return;
- kprintf("proc %d (%s): %s num ", p->p_pid, p->p_comm, em->e_name);
+ printf("proc %d (%s): %s num ", p->p_pid, p->p_comm, em->e_name);
if (code < 0 || code >= em->e_nsysent)
- kprintf("OUT OF RANGE (%d)", code);
+ printf("OUT OF RANGE (%d)", code);
else {
- kprintf("%d call: %s", code, em->e_syscallnames[code]);
+ printf("%d call: %s", code, em->e_syscallnames[code]);
if (scdebug & SCDEBUG_SHOWARGS) {
- kprintf("(");
+ printf("(");
for (i = 0; i < sy->sy_argsize / sizeof(register_t);
i++)
- kprintf("%s0x%lx", i == 0 ? "" : ", ",
+ printf("%s0x%lx", i == 0 ? "" : ", ",
(long)args[i]);
- kprintf(")");
+ printf(")");
}
}
- kprintf("\n");
+ printf("\n");
}
void
@@ -139,12 +139,12 @@ scdebug_ret(p, code, error, retval)
sy->sy_call == sys_nosys))
return;
- kprintf("proc %d (%s): %s num ", p->p_pid, p->p_comm, em->e_name);
+ printf("proc %d (%s): %s num ", p->p_pid, p->p_comm, em->e_name);
if (code < 0 || code >= em->e_nsysent)
- kprintf("OUT OF RANGE (%d)", code);
+ printf("OUT OF RANGE (%d)", code);
else
- kprintf("%d ret: err = %d, rv = 0x%lx,0x%lx", code,
+ printf("%d ret: err = %d, rv = 0x%lx,0x%lx", code,
error, (long)retval[0], (long)retval[1]);
- kprintf("\n");
+ printf("\n");
}
#endif /* SYSCALL_DEBUG */
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 3c1b83c26e3..ad2c08a6890 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.23 1996/10/10 22:46:23 christos Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.24 1996/10/13 02:32:37 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -262,7 +262,7 @@ config_found_sm(parent, aux, print, submatch)
if ((match = config_search(submatch, parent, aux)) != NULL)
return (config_attach(parent, match, aux, print));
if (print)
- kprintf(msgs[(*print)(aux, parent->dv_xname)]);
+ printf(msgs[(*print)(aux, parent->dv_xname)]);
return (NULL);
}
@@ -278,7 +278,7 @@ config_rootfound(rootname, aux)
if ((match = config_rootsearch((cfmatch_t)NULL, rootname, aux)) != NULL)
return (config_attach(ROOT, match, aux, (cfprint_t)NULL));
- kprintf("root device %s not configured\n", rootname);
+ printf("root device %s not configured\n", rootname);
return (NULL);
}
@@ -333,9 +333,9 @@ config_attach(parent, match, aux, print)
TAILQ_INSERT_TAIL(&alldevs, dev, dv_list);
if (parent == ROOT)
- kprintf("%s (root)", dev->dv_xname);
+ printf("%s (root)", dev->dv_xname);
else {
- kprintf("%s at %s", dev->dv_xname, parent->dv_xname);
+ printf("%s at %s", dev->dv_xname, parent->dv_xname);
if (print)
(void) (*print)(aux, (char *)0);
}
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 1808092f740..58409a10879 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.19 1996/10/10 22:46:24 christos Exp $ */
+/* $NetBSD: subr_disk.c,v 1.20 1996/10/13 02:32:37 christos Exp $ */
/*
* Copyright (c) 1995 Jason R. Thorpe. All rights reserved.
@@ -183,9 +183,9 @@ hp0g: hard error reading fsbn 12345 of 12344-12347 (hp0 bn %d cn %d tn %d sn %d)
* if the offset of the error in the transfer and a disk label
* are both available. blkdone should be -1 if the position of the error
* is unknown; the disklabel pointer may be null from drivers that have not
- * been converted to use them. The message is printed with kprintf
+ * been converted to use them. The message is printed with printf
* if pri is LOG_PRINTF, otherwise it uses log at the specified priority.
- * The message should be completed (with at least a newline) with kprintf
+ * The message should be completed (with at least a newline) with printf
* or addlog, respectively. There is no trailing space.
*/
void
@@ -205,7 +205,7 @@ diskerr(bp, dname, what, pri, blkdone, lp)
log(pri, fmt);
pr = addlog;
} else
- pr = kprintf;
+ pr = printf;
(*pr)("%s%d%c: %s %sing fsbn ", dname, unit, partname, what,
bp->b_flags & B_READ ? "read" : "writ");
sn = bp->b_blkno;
diff --git a/sys/kern/subr_extent.c b/sys/kern/subr_extent.c
index 73b87efd032..c59dbdbfcfd 100644
--- a/sys/kern/subr_extent.c
+++ b/sys/kern/subr_extent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_extent.c,v 1.4 1996/10/10 22:46:25 christos Exp $ */
+/* $NetBSD: subr_extent.c,v 1.5 1996/10/13 02:32:38 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ extent_create(name, start, end, mtype, storage, storagesize, flags)
if (name == NULL)
panic("extent_create: name == NULL");
if (end < start) {
- kprintf("extent_create: extent `%s', start 0x%lx, end 0x%lx\n",
+ printf("extent_create: extent `%s', start 0x%lx, end 0x%lx\n",
name, start, end);
panic("extent_create: end < start");
}
@@ -200,7 +200,7 @@ extent_insert_and_optimize(ex, start, size, flags, after)
rp = extent_alloc_region_descriptor(ex, flags);
if (rp == NULL) {
#if defined(DEBUG) || defined(DIAGNOSTIC)
- kprintf("extent `%s': can't alloc region descriptor.\n",
+ printf("extent `%s': can't alloc region descriptor.\n",
ex->ex_name);
#endif
return (ENOMEM);
@@ -273,7 +273,7 @@ extent_insert_and_optimize(ex, start, size, flags, after)
rp = extent_alloc_region_descriptor(ex, flags);
if (rp == NULL) {
#if defined(DEBUG) || defined(DIAGNOSTIC)
- kprintf("extent `%s': can't allocate region descriptor.\n",
+ printf("extent `%s': can't allocate region descriptor.\n",
ex->ex_name);
#endif
return (ENOMEM);
@@ -301,12 +301,12 @@ extent_alloc_region(ex, start, size, flags)
if (ex == NULL)
panic("extent_alloc_region: NULL extent");
if (size < 1) {
- kprintf("extent_alloc_region: extent `%s', size 0x%lx\n",
+ printf("extent_alloc_region: extent `%s', size 0x%lx\n",
ex->ex_name, size);
panic("extent_alloc_region: bad size");
}
if (end < start) {
- kprintf(
+ printf(
"extent_alloc_region: extent `%s', start 0x%lx, size 0x%lx\n",
ex->ex_name, start, size);
panic("extent_alloc_region: overflow");
@@ -316,9 +316,9 @@ extent_alloc_region(ex, start, size, flags)
* extent.
*/
if ((start < ex->ex_start) || (end > ex->ex_end)) {
- kprintf("extent_alloc_region: extent `%s' (0x%lx - 0x%lx)\n",
+ printf("extent_alloc_region: extent `%s' (0x%lx - 0x%lx)\n",
ex->ex_name, ex->ex_start, ex->ex_end);
- kprintf("extent_alloc_region: start 0x%lx, end 0x%lx\n",
+ printf("extent_alloc_region: start 0x%lx, end 0x%lx\n",
start, end);
panic("extent_alloc_region: region lies outside extent");
}
@@ -422,21 +422,21 @@ extent_alloc_subregion(ex, substart, subend, size, alignment, boundary,
panic("extent_alloc_subregion: NULL result pointer");
if ((substart < ex->ex_start) || (substart >= ex->ex_end) ||
(subend > ex->ex_end) || (subend <= ex->ex_start)) {
- kprintf("extent_alloc_subregion: extent `%s', ex_start 0x%lx, ex_end 0x%lx\n",
+ printf("extent_alloc_subregion: extent `%s', ex_start 0x%lx, ex_end 0x%lx\n",
ex->ex_name, ex->ex_start, ex->ex_end);
- kprintf("extent_alloc_subregion: substart 0x%lx, subend 0x%lx\n",
+ printf("extent_alloc_subregion: substart 0x%lx, subend 0x%lx\n",
substart, subend);
panic("extent_alloc_subregion: bad subregion");
}
if ((size < 1) || (size > ((subend - substart) + 1))) {
- kprintf("extent_alloc_subregion: extent `%s', size 0x%lx\n",
+ printf("extent_alloc_subregion: extent `%s', size 0x%lx\n",
ex->ex_name, size);
panic("extent_alloc_subregion: bad size");
}
if (alignment == 0)
panic("extent_alloc_subregion: bad alignment");
if (boundary && (boundary < size)) {
- kprintf(
+ printf(
"extent_alloc_subregion: extent `%s', size 0x%lx,
boundary 0x%lx\n", ex->ex_name, size, boundary);
panic("extent_alloc_subregion: bad boundary");
@@ -488,7 +488,7 @@ extent_alloc_subregion(ex, substart, subend, size, alignment, boundary,
*/
newstart = EXTENT_ALIGN(substart, alignment);
if (newstart < ex->ex_start) {
- kprintf(
+ printf(
"extent_alloc_subregion: extent `%s' (0x%lx - 0x%lx), alignment 0x%lx\n",
ex->ex_name, ex->ex_start, ex->ex_end, alignment);
panic("extent_alloc_subregion: overflow after alignment");
@@ -666,7 +666,7 @@ extent_free(ex, start, size, flags)
panic("extent_free: NULL extent");
if ((start < ex->ex_start) || (start > ex->ex_end)) {
extent_print(ex);
- kprintf("extent_free: extent `%s', start 0x%lx, size 0x%lx\n",
+ printf("extent_free: extent `%s', start 0x%lx, size 0x%lx\n",
ex->ex_name, start, size);
panic("extent_free: extent `%s', region not within extent",
ex->ex_name);
@@ -674,7 +674,7 @@ extent_free(ex, start, size, flags)
/* Check for an overflow. */
if (end < start) {
extent_print(ex);
- kprintf("extent_free: extent `%s', start 0x%lx, size 0x%lx\n",
+ printf("extent_free: extent `%s', start 0x%lx, size 0x%lx\n",
ex->ex_name, start, size);
panic("extent_free: overflow");
}
@@ -766,7 +766,7 @@ extent_free(ex, start, size, flags)
/* Region not found, or request otherwise invalid. */
extent_print(ex);
- kprintf("extent_free: start 0x%lx, end 0x%lx\n", start, end);
+ printf("extent_free: start 0x%lx, end 0x%lx\n", start, end);
panic("extent_free: region not found");
done:
@@ -848,10 +848,10 @@ extent_print(ex)
if (ex == NULL)
panic("extent_print: NULL extent");
- kprintf("extent `%s' (0x%lx - 0x%lx), flags = 0x%x\n", ex->ex_name,
+ printf("extent `%s' (0x%lx - 0x%lx), flags = 0x%x\n", ex->ex_name,
ex->ex_start, ex->ex_end, ex->ex_flags);
for (rp = ex->ex_regions.lh_first; rp != NULL;
rp = rp->er_link.le_next)
- kprintf(" 0x%lx - 0x%lx\n", rp->er_start, rp->er_end);
+ printf(" 0x%lx - 0x%lx\n", rp->er_start, rp->er_end);
}
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index aa10beb557c..a20ad90e9e8 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.29 1996/10/10 22:46:27 christos Exp $ */
+/* $NetBSD: subr_prf.c,v 1.30 1996/10/13 02:32:39 christos Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -82,7 +82,7 @@ void (*v_putc) __P((int)) = cnputc; /* routine to putc on virtual console */
static void putchar __P((int, int, struct tty *));
static char *ksprintn __P((u_long, int, int *));
-void kdoprnt __P((const char *, int, struct tty *, va_list));
+void kprintf __P((const char *, int, struct tty *, va_list));
int consintr = 1; /* Ok to handle console interrupts? */
@@ -116,7 +116,7 @@ panic(fmt, va_alist)
panicstr = fmt;
va_start(ap, fmt);
- kprintf("panic: %:\n", fmt, ap);
+ printf("panic: %:", fmt, ap);
va_end(ap);
#if NKGDB > 0
@@ -165,7 +165,7 @@ uprintf(fmt, va_alist)
if (p->p_flag & P_CONTROLT && p->p_session->s_ttyvp) {
va_start(ap, fmt);
- kdoprnt(fmt, TOTTY, p->p_session->s_ttyp, ap);
+ kprintf(fmt, TOTTY, p->p_session->s_ttyp, ap);
va_end(ap);
}
}
@@ -216,7 +216,7 @@ tprintf(tpr, fmt, va_alist)
tp = sess->s_ttyp;
}
va_start(ap, fmt);
- kdoprnt(fmt, flags, tp, ap);
+ kprintf(fmt, flags, tp, ap);
va_end(ap);
logwakeup();
}
@@ -239,7 +239,7 @@ ttyprintf(tp, fmt, va_alist)
va_list ap;
va_start(ap, fmt);
- kdoprnt(fmt, TOTTY, tp, ap);
+ kprintf(fmt, TOTTY, tp, ap);
va_end(ap);
}
@@ -266,12 +266,12 @@ log(level, fmt, va_alist)
s = splhigh();
logpri(level);
va_start(ap, fmt);
- kdoprnt(fmt, TOLOG, NULL, ap);
+ kprintf(fmt, TOLOG, NULL, ap);
splx(s);
va_end(ap);
if (!log_open) {
va_start(ap, fmt);
- kdoprnt(fmt, TOCONS, NULL, ap);
+ kprintf(fmt, TOCONS, NULL, ap);
va_end(ap);
}
logwakeup();
@@ -304,12 +304,12 @@ addlog(fmt, va_alist)
s = splhigh();
va_start(ap, fmt);
- kdoprnt(fmt, TOLOG, NULL, ap);
+ kprintf(fmt, TOLOG, NULL, ap);
splx(s);
va_end(ap);
if (!log_open) {
va_start(ap, fmt);
- kdoprnt(fmt, TOCONS, NULL, ap);
+ kprintf(fmt, TOCONS, NULL, ap);
va_end(ap);
}
logwakeup();
@@ -317,9 +317,9 @@ addlog(fmt, va_alist)
void
#ifdef __STDC__
-kprintf(const char *fmt, ...)
+printf(const char *fmt, ...)
#else
-kprintf(fmt, va_alist)
+printf(fmt, va_alist)
char *fmt;
va_dcl
#endif
@@ -330,7 +330,7 @@ kprintf(fmt, va_alist)
savintr = consintr; /* disable interrupts */
consintr = 0;
va_start(ap, fmt);
- kdoprnt(fmt, TOCONS | TOLOG, NULL, ap);
+ kprintf(fmt, TOCONS | TOLOG, NULL, ap);
va_end(ap);
if (!panicstr)
logwakeup();
@@ -345,7 +345,7 @@ kprintf(fmt, va_alist)
* The format %b is supported to decode error registers.
* Its usage is:
*
- * kprintf("reg=%b\n", regval, "<base><arg>*");
+ * printf("reg=%b\n", regval, "<base><arg>*");
*
* where <base> is the output base expressed as a control character, e.g.
* \10 gives octal; \20 gives hex. Each arg is a sequence of characters,
@@ -353,7 +353,7 @@ kprintf(fmt, va_alist)
* the next characters (up to a control character, i.e. a character <= 32),
* give the name of the register. Thus:
*
- * kdoprnt("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
+ * kprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
*
* would produce output:
*
@@ -366,7 +366,7 @@ kprintf(fmt, va_alist)
* {
* va_list ap;
* va_start(ap, fmt);
- * kprintf("prefix: %: suffix\n", fmt, ap);
+ * printf("prefix: %: suffix\n", fmt, ap);
* va_end(ap);
* }
*
@@ -374,7 +374,7 @@ kprintf(fmt, va_alist)
* formats only.
*/
void
-kdoprnt(fmt, flags, tp, ap)
+kprintf(fmt, flags, tp, ap)
register const char *fmt;
int flags;
struct tty *tp;
@@ -439,7 +439,7 @@ reswitch: switch (ch = *(u_char *)fmt++) {
break;
case ':':
p = va_arg(ap, char *);
- kdoprnt(p, flags, tp, va_arg(ap, va_list));
+ kprintf(p, flags, tp, va_arg(ap, va_list));
break;
case 's':
if ((p = va_arg(ap, char *)) == NULL)
@@ -533,9 +533,9 @@ putchar(c, flags, tp)
*/
int
#ifdef __STDC__
-ksprintf(char *buf, const char *cfmt, ...)
+sprintf(char *buf, const char *cfmt, ...)
#else
-ksprintf(buf, cfmt, va_alist)
+sprintf(buf, cfmt, va_alist)
char *buf,
const char *cfmt;
va_dcl
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 3f7218352ff..37c29f7a5e9 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prof.c,v 1.13 1996/10/10 22:46:28 christos Exp $ */
+/* $NetBSD: subr_prof.c,v 1.14 1996/10/13 02:32:40 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -69,7 +69,7 @@ kmstartup()
p->lowpc = ROUNDDOWN(KERNBASE, HISTFRACTION * sizeof(HISTCOUNTER));
p->highpc = ROUNDUP((u_long)etext, HISTFRACTION * sizeof(HISTCOUNTER));
p->textsize = p->highpc - p->lowpc;
- kprintf("Profiling kernel, textsize=%ld [%lx..%lx]\n",
+ printf("Profiling kernel, textsize=%ld [%lx..%lx]\n",
p->textsize, p->lowpc, p->highpc);
p->kcountsize = p->textsize / HISTFRACTION;
p->hashfraction = HASHFRACTION;
@@ -83,7 +83,7 @@ kmstartup()
cp = (char *)malloc(p->kcountsize + p->fromssize + p->tossize,
M_GPROF, M_NOWAIT);
if (cp == 0) {
- kprintf("No memory for profiling.\n");
+ printf("No memory for profiling.\n");
return;
}
bzero(cp, p->kcountsize + p->tossize + p->fromssize);
diff --git a/sys/kern/subr_rmap.c b/sys/kern/subr_rmap.c
index 6c73d7a5368..c4b71fab486 100644
--- a/sys/kern/subr_rmap.c
+++ b/sys/kern/subr_rmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_rmap.c,v 1.12 1996/10/10 22:46:29 christos Exp $ */
+/* $NetBSD: subr_rmap.c,v 1.13 1996/10/13 02:32:41 christos Exp $ */
/*
* Copyright (C) 1992, 1994 Wolfgang Solfrank.
@@ -207,12 +207,12 @@ rmfree(mp, size, addr)
*/
if (fp->m_size > size) {
/* range to free is smaller, so drop that */
- kprintf("rmfree: map '%s' loses space (%ld)\n",
+ printf("rmfree: map '%s' loses space (%ld)\n",
mp->m_name, size);
return;
} else {
/* drop the smallest slot in the list */
- kprintf("rmfree: map '%s' loses space (%ld)\n",
+ printf("rmfree: map '%s' loses space (%ld)\n",
mp->m_name, fp->m_size);
ovbcopy(fp + 1, fp,
(char *)(mp->m_limit - 1) - (char *)fp);
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 017ded3ebd9..fee6f11eac4 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_msg.c,v 1.20 1996/10/10 22:43:21 christos Exp $ */
+/* $NetBSD: sysv_msg.c,v 1.21 1996/10/13 02:32:42 christos Exp $ */
/*
* Implementation of SVID messages
@@ -33,7 +33,7 @@
#undef MSG_DEBUG_OK
#ifdef MSG_DEBUG_OK
-#define MSG_PRINTF(a) kprintf a
+#define MSG_PRINTF(a) printf a
#else
#define MSG_PRINTF(a)
#endif
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 22d12ea6e7a..84074f7fe4c 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_sem.c,v 1.27 1996/10/10 22:43:22 christos Exp $ */
+/* $NetBSD: sysv_sem.c,v 1.28 1996/10/13 02:32:43 christos Exp $ */
/*
* Implementation of SVID semaphores
@@ -22,7 +22,7 @@ int semtot = 0;
struct proc *semlock_holder = NULL;
#ifdef SEM_DEBUG
-#define SEM_PRINTF(a) kprintf a
+#define SEM_PRINTF(a) printf a
#else
#define SEM_PRINTF(a)
#endif
@@ -101,7 +101,7 @@ sys_semconfig(p, v, retval)
break;
default:
- kprintf(
+ printf(
"semconfig: unknown flag parameter value (%d) - ignored\n",
SCARG(uap, flag));
eval = EINVAL;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index ec9d7dfd1e5..bd3e8080788 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.75 1996/10/10 22:46:31 christos Exp $ */
+/* $NetBSD: tty.c,v 1.76 1996/10/13 02:32:45 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1991, 1993
@@ -1700,7 +1700,7 @@ ttyrub(c, tp)
break;
default: /* XXX */
#define PANICSTR "ttyrub: would panic c = %d, val = %d\n"
- (void)kprintf(PANICSTR, c, CCLASS(c));
+ (void)printf(PANICSTR, c, CCLASS(c));
#ifdef notdef
panic(PANICSTR, c, CCLASS(c));
#endif
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 3ba64b40596..b8c9d297fe2 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_subr.c,v 1.14 1996/10/10 22:46:33 christos Exp $ */
+/* $NetBSD: tty_subr.c,v 1.15 1996/10/13 02:32:46 christos Exp $ */
/*
* Copyright (c) 1993, 1994 Theo de Raadt
@@ -294,7 +294,7 @@ putc(c, clp)
if (clp->c_cc == 0) {
if (!clp->c_cs) {
#if defined(DIAGNOSTIC) || 1
- kprintf("putc: required clalloc\n");
+ printf("putc: required clalloc\n");
#endif
if(clalloc(clp, 1024, 1)) {
out:
@@ -392,7 +392,7 @@ b_to_q(cp, count, clp)
if (clp->c_cc == 0) {
if (!clp->c_cs) {
#if defined(DIAGNOSTIC) || 1
- kprintf("b_to_q: required clalloc\n");
+ printf("b_to_q: required clalloc\n");
#endif
if(clalloc(clp, 1024, 1))
goto out;
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index e694ef483ba..45685b1dd0a 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.14 1996/10/10 22:46:34 christos Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.15 1996/10/13 02:32:47 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -487,7 +487,7 @@ sbcheck(sb)
panic("sbcheck nextpkt");
}
if (len != sb->sb_cc || mbcnt != sb->sb_mbcnt) {
- kprintf("cc %d != %d || mbcnt %d != %d\n", len, sb->sb_cc,
+ printf("cc %d != %d || mbcnt %d != %d\n", len, sb->sb_cc,
mbcnt, sb->sb_mbcnt);
panic("sbcheck");
}
@@ -699,7 +699,7 @@ sbcompress(sb, m, n)
if (n)
n->m_flags |= eor;
else
- kprintf("semi-panic: sbcompress\n");
+ printf("semi-panic: sbcompress\n");
}
}
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 8ccba31f18b..f0538265439 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.47 1996/10/10 22:46:36 christos Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.48 1996/10/13 02:32:48 christos Exp $ */
/*-
* Copyright (c) 1994 Christopher G. Demetriou
@@ -838,11 +838,11 @@ vfs_bufstats()
count++;
}
splx(s);
- kprintf("%s: total-%d", bname[i], count);
+ printf("%s: total-%d", bname[i], count);
for (j = 0; j <= MAXBSIZE/CLBYTES; j++)
if (counts[j] != 0)
- kprintf(", %d-%d", j * CLBYTES, counts[j]);
- kprintf("\n");
+ printf(", %d-%d", j * CLBYTES, counts[j]);
+ printf("\n");
}
}
#endif /* DEBUG */
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 8275d73d998..af55e854c83 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cluster.c,v 1.13 1996/10/10 22:46:37 christos Exp $ */
+/* $NetBSD: vfs_cluster.c,v 1.14 1996/10/13 02:32:49 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -706,9 +706,9 @@ redo:
/* Move memory from children to parent */
if (tbp->b_blkno != (bp->b_blkno + btodb(bp->b_bufsize))) {
- kprintf("Clustered Block: %d addr %x bufsize: %ld\n",
+ printf("Clustered Block: %d addr %x bufsize: %ld\n",
bp->b_lblkno, bp->b_blkno, bp->b_bufsize);
- kprintf("Child Block: %d addr: %x\n", tbp->b_lblkno,
+ printf("Child Block: %d addr: %x\n", tbp->b_lblkno,
tbp->b_blkno);
panic("Clustered write to wrong blocks");
}
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 1c75416f2c1..fbc524474f9 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_init.c,v 1.7 1996/10/10 22:46:38 christos Exp $ */
+/* $NetBSD: vfs_init.c,v 1.8 1996/10/13 02:32:50 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -130,7 +130,7 @@ vfs_opv_init_explicit(vfs_opv_desc)
vfs_opv_numops * sizeof(PFI), M_VNODE, M_WAITOK);
bzero(opv_desc_vector, vfs_opv_numops * sizeof(PFI));
*(vfs_opv_desc->opv_desc_vector_p) = opv_desc_vector;
- DODEBUG(kprintf("vector at %p allocated\n",
+ DODEBUG(printf("vector at %p allocated\n",
opv_desc_vector_p));
}
@@ -156,7 +156,7 @@ vfs_opv_init_explicit(vfs_opv_desc)
*/
if (opve_descp->opve_op->vdesc_offset == 0 &&
opve_descp->opve_op->vdesc_offset != VOFFSET(vop_default)) {
- kprintf("operation %s not listed in %s.\n",
+ printf("operation %s not listed in %s.\n",
opve_descp->opve_op->vdesc_name, "vfs_op_descs");
panic ("vfs_opv_init: bad operation");
}
@@ -217,7 +217,7 @@ vfs_op_init()
{
int i;
- DODEBUG(kprintf("Vnode_interface_init.\n"));
+ DODEBUG(printf("Vnode_interface_init.\n"));
/*
* Set all vnode vectors to a well known value.
*/
@@ -231,7 +231,7 @@ vfs_op_init()
vfs_op_descs[i]->vdesc_offset = vfs_opv_numops;
vfs_opv_numops++;
}
- DODEBUG(kprintf ("vfs_opv_numops=%d\n", vfs_opv_numops));
+ DODEBUG(printf ("vfs_opv_numops=%d\n", vfs_opv_numops));
}
/*
diff --git a/sys/kern/vfs_lockf.c b/sys/kern/vfs_lockf.c
index da02796a064..06cd5bf1c13 100644
--- a/sys/kern/vfs_lockf.c
+++ b/sys/kern/vfs_lockf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lockf.c,v 1.8 1996/10/10 22:46:39 christos Exp $ */
+/* $NetBSD: vfs_lockf.c,v 1.9 1996/10/13 02:32:51 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -578,7 +578,7 @@ lf_findoverlap(lf, lock, type, prev, overlap)
/* Case 0 */
#ifdef LOCKF_DEBUG
if (lockf_debug & 2)
- kprintf("no overlap\n");
+ printf("no overlap\n");
#endif /* LOCKF_DEBUG */
if ((type & SELF) && end != -1 && lf->lf_start > end)
return (0);
@@ -590,7 +590,7 @@ lf_findoverlap(lf, lock, type, prev, overlap)
/* Case 1 */
#ifdef LOCKF_DEBUG
if (lockf_debug & 2)
- kprintf("overlap == lock\n");
+ printf("overlap == lock\n");
#endif /* LOCKF_DEBUG */
return (1);
}
@@ -600,7 +600,7 @@ lf_findoverlap(lf, lock, type, prev, overlap)
/* Case 2 */
#ifdef LOCKF_DEBUG
if (lockf_debug & 2)
- kprintf("overlap contains lock\n");
+ printf("overlap contains lock\n");
#endif /* LOCKF_DEBUG */
return (2);
}
@@ -610,7 +610,7 @@ lf_findoverlap(lf, lock, type, prev, overlap)
/* Case 3 */
#ifdef LOCKF_DEBUG
if (lockf_debug & 2)
- kprintf("lock contains overlap\n");
+ printf("lock contains overlap\n");
#endif /* LOCKF_DEBUG */
return (3);
}
@@ -619,7 +619,7 @@ lf_findoverlap(lf, lock, type, prev, overlap)
/* Case 4 */
#ifdef LOCKF_DEBUG
if (lockf_debug & 2)
- kprintf("overlap starts before lock\n");
+ printf("overlap starts before lock\n");
#endif /* LOCKF_DEBUG */
return (4);
}
@@ -629,7 +629,7 @@ lf_findoverlap(lf, lock, type, prev, overlap)
/* Case 5 */
#ifdef LOCKF_DEBUG
if (lockf_debug & 2)
- kprintf("overlap ends after lock\n");
+ printf("overlap ends after lock\n");
#endif /* LOCKF_DEBUG */
return (5);
}
@@ -748,12 +748,12 @@ lf_print(tag, lock)
register struct lockf *lock;
{
- kprintf("%s: lock %p for ", tag, lock);
+ printf("%s: lock %p for ", tag, lock);
if (lock->lf_flags & F_POSIX)
- kprintf("proc %d", ((struct proc *)(lock->lf_id))->p_pid);
+ printf("proc %d", ((struct proc *)(lock->lf_id))->p_pid);
else
- kprintf("id 0x%x", lock->lf_id);
- kprintf(" in ino %d on dev <%d, %d>, %s, start %d, end %d",
+ printf("id 0x%x", lock->lf_id);
+ printf(" in ino %d on dev <%d, %d>, %s, start %d, end %d",
lock->lf_inode->i_number,
major(lock->lf_inode->i_dev),
minor(lock->lf_inode->i_dev),
@@ -762,9 +762,9 @@ lf_print(tag, lock)
lock->lf_type == F_UNLCK ? "unlock" :
"unknown", lock->lf_start, lock->lf_end);
if (lock->lf_block)
- kprintf(" block %p\n", lock->lf_block);
+ printf(" block %p\n", lock->lf_block);
else
- kprintf("\n");
+ printf("\n");
}
void
@@ -774,25 +774,25 @@ lf_printlist(tag, lock)
{
register struct lockf *lf;
- kprintf("%s: Lock list for ino %d on dev <%d, %d>:\n",
+ printf("%s: Lock list for ino %d on dev <%d, %d>:\n",
tag, lock->lf_inode->i_number,
major(lock->lf_inode->i_dev),
minor(lock->lf_inode->i_dev));
for (lf = lock->lf_inode->i_lockf; lf; lf = lf->lf_next) {
- kprintf("\tlock %p for ", lf);
+ printf("\tlock %p for ", lf);
if (lf->lf_flags & F_POSIX)
- kprintf("proc %d", ((struct proc *)(lf->lf_id))->p_pid);
+ printf("proc %d", ((struct proc *)(lf->lf_id))->p_pid);
else
- kprintf("id 0x%x", lf->lf_id);
- kprintf(", %s, start %d, end %d",
+ printf("id 0x%x", lf->lf_id);
+ printf(", %s, start %d, end %d",
lf->lf_type == F_RDLCK ? "shared" :
lf->lf_type == F_WRLCK ? "exclusive" :
lf->lf_type == F_UNLCK ? "unlock" :
"unknown", lf->lf_start, lf->lf_end);
if (lf->lf_block)
- kprintf(" block %p\n", lf->lf_block);
+ printf(" block %p\n", lf->lf_block);
else
- kprintf("\n");
+ printf("\n");
}
}
#endif /* LOCKF_DEBUG */
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 7a240b7913d..46f3b40f96a 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.18 1996/10/10 22:46:40 christos Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.19 1996/10/13 02:32:52 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -297,7 +297,7 @@ dirloop:
#ifdef NAMEI_DIAGNOSTIC
{ char c = *cp;
*cp = '\0';
- kprintf("{%s}: ", cnp->cn_nameptr);
+ printf("{%s}: ", cnp->cn_nameptr);
*cp = c; }
#endif
ndp->ni_pathlen -= cnp->cn_namelen;
@@ -382,7 +382,7 @@ unionlookup:
panic("leaf should be empty");
#endif
#ifdef NAMEI_DIAGNOSTIC
- kprintf("not found\n");
+ printf("not found\n");
#endif
if ((error == ENOENT) &&
(dp->v_flag & VROOT) &&
@@ -417,7 +417,7 @@ unionlookup:
return (0);
}
#ifdef NAMEI_DIAGNOSTIC
- kprintf("found\n");
+ printf("found\n");
#endif
/*
@@ -557,7 +557,7 @@ relookup(dvp, vpp, cnp)
panic ("relookup: bad len");
if (*cp != 0)
panic("relookup: not last component");
- kprintf("{%s}: ", cnp->cn_nameptr);
+ printf("{%s}: ", cnp->cn_nameptr);
#endif
/*
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 8401cf2d776..d4749f7f538 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.56 1996/10/10 22:46:41 christos Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.57 1996/10/13 02:32:53 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -590,7 +590,7 @@ reassignbuf(bp, newvp)
register struct buflists *listheadp;
if (newvp == NULL) {
- kprintf("reassignbuf: NULL");
+ printf("reassignbuf: NULL");
return;
}
/*
@@ -1189,8 +1189,8 @@ vprint(label, vp)
char buf[64];
if (label != NULL)
- kprintf("%s: ", label);
- kprintf("type %s, usecount %d, writecount %d, refcount %ld,",
+ printf("%s: ", label);
+ printf("type %s, usecount %d, writecount %d, refcount %ld,",
typename[vp->v_type], vp->v_usecount, vp->v_writecount,
vp->v_holdcnt);
buf[0] = '\0';
@@ -1209,11 +1209,11 @@ vprint(label, vp)
if (vp->v_flag & VALIASED)
strcat(buf, "|VALIASED");
if (buf[0] != '\0')
- kprintf(" flags (%s)", &buf[1]);
+ printf(" flags (%s)", &buf[1]);
if (vp->v_data == NULL) {
- kprintf("\n");
+ printf("\n");
} else {
- kprintf("\n\t");
+ printf("\n\t");
VOP_PRINT(vp);
}
}
@@ -1229,7 +1229,7 @@ printlockedvnodes()
register struct mount *mp;
register struct vnode *vp;
- kprintf("Locked vnodes\n");
+ printf("Locked vnodes\n");
for (mp = mountlist.cqh_first; mp != (void *)&mountlist;
mp = mp->mnt_list.cqe_next) {
for (vp = mp->mnt_vnodelist.lh_first;
@@ -1284,7 +1284,7 @@ again:
*/
if (vp->v_mount != mp) {
if (kinfo_vdebug)
- kprintf("kinfo: vp changed\n");
+ printf("kinfo: vp changed\n");
bp = savebp;
goto again;
}
@@ -1558,17 +1558,17 @@ vfs_unmountall()
mp = mountlist.cqh_last; mp != (void *)&mountlist; mp = nmp) {
nmp = mp->mnt_list.cqe_prev;
#ifdef DEBUG
- kprintf("unmounting %s (%s)...\n",
+ printf("unmounting %s (%s)...\n",
mp->mnt_stat.f_mntonname, mp->mnt_stat.f_mntfromname);
#endif
if ((error = dounmount(mp, MNT_FORCE, &proc0)) != 0) {
- kprintf("unmount of %s failed with error %d\n",
+ printf("unmount of %s failed with error %d\n",
mp->mnt_stat.f_mntonname, error);
allerror = 1;
}
}
if (allerror)
- kprintf("WARNING: some file systems would not unmount\n");
+ printf("WARNING: some file systems would not unmount\n");
}
/*
@@ -1583,7 +1583,7 @@ vfs_shutdown()
/* XXX Should suspend scheduling. */
(void) spl0();
- kprintf("syncing disks... ");
+ printf("syncing disks... ");
if (panicstr == 0) {
/* Release inodes held by texts before update. */
@@ -1610,11 +1610,11 @@ vfs_shutdown()
nbusy++;
if (nbusy == 0)
break;
- kprintf("%d ", nbusy);
+ printf("%d ", nbusy);
DELAY(40000 * iter);
}
if (nbusy)
- kprintf("giving up\n");
+ printf("giving up\n");
else
- kprintf("done\n");
+ printf("done\n");
}