21 files changed, 20 insertions, 929 deletions

diff --git a/sys/arch/amiga/amiga/sys_machdep.c b/sys/arch/amiga/amiga/sys_machdep.c
index ad83021fec5..ba752670db2 100644
--- a/sys/arch/amiga/amiga/sys_machdep.c
+++ b/sys/arch/amiga/amiga/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.7 2000/06/08 22:25:17 niklas Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.8 2000/06/23 02:14:35 mickey Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.16 1997/05/19 10:14:47 veego Exp $	*/
 
 /*
@@ -47,70 +47,12 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
 #include <vm/vm.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-sys_vtrace(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	register struct sys_vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap = v;
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p;
-
-	p = pfind(arg);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 #include <machine/cpu.h>
 
 /* XXX should be in an include file somewhere */
diff --git a/sys/arch/atari/atari/sys_machdep.c b/sys/arch/atari/atari/sys_machdep.c
index 2dbd9e9c843..ca838cd5494 100644
--- a/sys/arch/atari/atari/sys_machdep.c
+++ b/sys/arch/atari/atari/sys_machdep.c
@@ -46,70 +46,12 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
 #include <vm/vm.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-sys_vtrace(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	register struct sys_vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap = v;
-	int vdoualarm();
-
-	switch(SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if(SCARG(uap, value) < 0 || SCARG(uap,value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap,value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if(SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if(SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz
-			|| nvualarm > 5)
-				return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p;
-
-	p = pfind(arg);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 #include <machine/cpu.h>
 
 /* XXX should be in an include file somewhere */
diff --git a/sys/arch/hp300/hp300/sys_machdep.c b/sys/arch/hp300/hp300/sys_machdep.c
index de730e066ab..d212e32791d 100644
--- a/sys/arch/hp300/hp300/sys_machdep.c
+++ b/sys/arch/hp300/hp300/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.6 2000/06/08 22:25:18 niklas Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.7 2000/06/23 02:14:36 mickey Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.17 1997/05/19 10:15:00 veego Exp $	*/
 
 /*
@@ -49,71 +49,12 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 #include <sys/mount.h>
 
 #include <vm/vm.h>
 
 #include <sys/syscallargs.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-sys_vtrace(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	struct sys_vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap = v;
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (void *)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-	void *arg;
-{
-	int pid = (int)arg;
-	struct proc *p;
-
-	p = pfind(pid);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 #include <machine/cpu.h>
 
 /* XXX should be in an include file somewhere */
diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c
index 51fc2e1e5ee..b4bba0601c2 100644
--- a/sys/arch/i386/i386/sys_machdep.c
+++ b/sys/arch/i386/i386/sys_machdep.c
@@ -51,7 +51,6 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 #include <sys/signal.h>
 
 #include <sys/mount.h>
@@ -85,64 +84,6 @@ int i386_iopl __P((struct proc *, char *, register_t *));
 int i386_get_ioperm __P((struct proc *, char *, register_t *));
 int i386_set_ioperm __P((struct proc *, char *, register_t *));
 
-#ifdef TRACE
-int	nvualarm;
-
-void
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p;
-
-	p = pfind(arg);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-
-int
-sys_vtrace(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	register struct sys_vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap = v;
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-#endif
-
 #ifdef USER_LDT
 /*
  * If the process has a local LDT, deallocate it, and restore the default from
diff --git a/sys/arch/kbus/kbus/sys_machdep.c b/sys/arch/kbus/kbus/sys_machdep.c
index 9d3698a47dc..c38b655305b 100644
--- a/sys/arch/kbus/kbus/sys_machdep.c
+++ b/sys/arch/kbus/kbus/sys_machdep.c
@@ -55,68 +55,10 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-int
-vtrace(p, uap, retval)
-	struct proc *p;
-	register struct vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-void
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p = pfind(arg);
-
-	if (p != NULL)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 int
 sys_sysarch(p, v, retval)
 	struct proc *p;
diff --git a/sys/arch/mac68k/mac68k/sys_machdep.c b/sys/arch/mac68k/mac68k/sys_machdep.c
index dd0dabff5ee..b4cc36c3064 100644
--- a/sys/arch/mac68k/mac68k/sys_machdep.c
+++ b/sys/arch/mac68k/mac68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.4 2000/06/08 22:25:20 niklas Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.5 2000/06/23 02:14:35 mickey Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.9 1996/05/05 06:18:58 briggs Exp $	*/
 
 /*
@@ -81,67 +81,10 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 #include <sys/mount.h>
 
 #include <sys/syscallargs.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-vtrace(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	register struct vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap = v;
-	int vdoualarm();
-
-	switch (uap->request) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (uap->value < 0 || uap->value >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[uap->value];
-		traceflags[uap->value] = uap->request;
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (uap->value < 0 || uap->value >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[uap->value];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (uap->value <= 0 || uap->value > 60 * hz || nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, uap->value);
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, uap->value, p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p;
-
-	p = pfind(arg);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 #include <machine/cpu.h>
 
 /* XXX should be in an include file somewhere */
diff --git a/sys/arch/mips/mips/sys_machdep.c b/sys/arch/mips/mips/sys_machdep.c
index d0bac152f23..47bebbe491e 100644
--- a/sys/arch/mips/mips/sys_machdep.c
+++ b/sys/arch/mips/mips/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.2 2000/06/08 22:25:20 niklas Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.3 2000/06/23 02:14:38 mickey Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,67 +49,10 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-vtrace(p, uap, retval)
-	struct proc *p;
-	register struct vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p;
-
-	p = pfind(arg);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 int
 sys_sysarch(p, v, retval)
 	struct proc *p;
diff --git a/sys/arch/mvme68k/mvme68k/sys_machdep.c b/sys/arch/mvme68k/mvme68k/sys_machdep.c
index 035e2f766a3..39a1841aa86 100644
--- a/sys/arch/mvme68k/mvme68k/sys_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.8 2000/06/08 22:25:21 niklas Exp $ */
+/*	$OpenBSD: sys_machdep.c,v 1.9 2000/06/23 02:14:37 mickey Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -46,67 +46,9 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 
 #include <vm/vm.h>
 
-#ifdef TRACE
-int   nvualarm;
-
-vtrace(p, uap, retval)
-struct proc *p;
-register struct vtrace_args /* {
-	syscallarg(int) request;
-	syscallarg(int) value;
-} */ *uap;
-register_t *retval;
-{
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-		
-		case VTR_DISABLE:		/* disable a trace point */
-		case VTR_ENABLE:		/* enable a trace point */
-			if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-				return (EINVAL);
-			*retval = traceflags[SCARG(uap, value)];
-			traceflags[SCARG(uap, value)] = SCARG(uap, request);
-			break;
-
-		case VTR_VALUE:		/* return a trace point setting */
-			if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-				return (EINVAL);
-			*retval = traceflags[SCARG(uap, value)];
-			break;
-
-		case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-			if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-				 nvualarm > 5)
-				return (EINVAL);
-			nvualarm++;
-			timeout(vdoualarm, (void *)p->p_pid, SCARG(uap, value));
-			break;
-
-		case VTR_STAMP:
-			trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-			break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-void *arg;
-{
-	register int pid = (int)arg;
-	register struct proc *p;
-
-	p = pfind(pid);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 #include <machine/cpu.h>
 
 /* XXX should be in an include file somewhere */
diff --git a/sys/arch/pc532/pc532/sys_machdep.c b/sys/arch/pc532/pc532/sys_machdep.c
index a0e5e695a0b..56f9f98dbcc 100644
--- a/sys/arch/pc532/pc532/sys_machdep.c
+++ b/sys/arch/pc532/pc532/sys_machdep.c
@@ -38,74 +38,4 @@
  *	@(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
  */
 
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <sys/signalvar.h>
-#include <sys/uio.h>
-#include <sys/kernel.h>
-#include <sys/mtio.h>
-#include <sys/buf.h>
-#include <sys/trace.h>
-#include <sys/mount.h>
-#include <sys/syscallargs.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-vtrace(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	register struct vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap = v;
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p;
-
-	p = pfind(arg);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
diff --git a/sys/arch/pmax/pmax/sys_machdep.c b/sys/arch/pmax/pmax/sys_machdep.c
index b1f06d4b61f..01e24d5734d 100644
--- a/sys/arch/pmax/pmax/sys_machdep.c
+++ b/sys/arch/pmax/pmax/sys_machdep.c
@@ -49,67 +49,9 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-vtrace(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	register struct vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap = v;
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p;
-
-	p = pfind(arg);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 int
 sys_sysarch(p, v, retval)
 	struct proc *p;
diff --git a/sys/arch/sparc/sparc/sys_machdep.c b/sys/arch/sparc/sparc/sys_machdep.c
index 72fbec4912f..37a6938a0cf 100644
--- a/sys/arch/sparc/sparc/sys_machdep.c
+++ b/sys/arch/sparc/sparc/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.4 2000/06/08 22:25:22 niklas Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.5 2000/06/23 02:14:37 mickey Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.7 1996/03/14 21:09:33 christos Exp $ */
 
 /*
@@ -56,68 +56,10 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-int
-vtrace(p, uap, retval)
-	struct proc *p;
-	register struct vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-void
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p = pfind(arg);
-
-	if (p != NULL)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 int
 sys_sysarch(p, v, retval)
 	struct proc *p;
diff --git a/sys/arch/sun3/sun3/sys_machdep.c b/sys/arch/sun3/sun3/sys_machdep.c
index f6105e3617b..c3103a9ea02 100644
--- a/sys/arch/sun3/sun3/sys_machdep.c
+++ b/sys/arch/sun3/sun3/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.7 2000/06/08 22:25:23 niklas Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.8 2000/06/23 02:14:37 mickey Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.3 1995/10/27 15:58:23 gwr Exp $	*/
 
 /*
@@ -47,7 +47,6 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 #include <sys/mount.h>
 
 #include <vm/vm.h>
@@ -57,66 +56,6 @@
 #include <machine/cpu.h>
 #include <machine/machdep.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-int
-sys_vtrace(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	register struct sys_vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap = v;
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (void *)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-void
-vdoualarm(arg)
-	void *arg;
-{
-	register int pid = (int)arg;
-	register struct proc *p;
-
-	p = pfind(pid);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 /* XXX should be in an include file somewhere */
 #define CC_PURGE	1
 #define CC_FLUSH	2
diff --git a/sys/arch/wgrisc/wgrisc/sys_machdep.c b/sys/arch/wgrisc/wgrisc/sys_machdep.c
index aabffa1a4cf..57375e4c7cb 100644
--- a/sys/arch/wgrisc/wgrisc/sys_machdep.c
+++ b/sys/arch/wgrisc/wgrisc/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.2 2000/06/08 22:25:23 niklas Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.3 2000/06/23 02:14:38 mickey Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.6 1994/10/26 21:10:42 cgd Exp $	*/
 
 /*
@@ -50,67 +50,10 @@
 #include <sys/kernel.h>
 #include <sys/mtio.h>
 #include <sys/buf.h>
-#include <sys/trace.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#ifdef TRACE
-int	nvualarm;
-
-vtrace(p, uap, retval)
-	struct proc *p;
-	register struct vtrace_args /* {
-		syscallarg(int) request;
-		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
-	int vdoualarm();
-
-	switch (SCARG(uap, request)) {
-
-	case VTR_DISABLE:		/* disable a trace point */
-	case VTR_ENABLE:		/* enable a trace point */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		traceflags[SCARG(uap, value)] = SCARG(uap, request);
-		break;
-
-	case VTR_VALUE:		/* return a trace point setting */
-		if (SCARG(uap, value) < 0 || SCARG(uap, value) >= TR_NFLAGS)
-			return (EINVAL);
-		*retval = traceflags[SCARG(uap, value)];
-		break;
-
-	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
-		if (SCARG(uap, value) <= 0 || SCARG(uap, value) > 60 * hz ||
-		    nvualarm > 5)
-			return (EINVAL);
-		nvualarm++;
-		timeout(vdoualarm, (caddr_t)p->p_pid, SCARG(uap, value));
-		break;
-
-	case VTR_STAMP:
-		trace(TR_STAMP, SCARG(uap, value), p->p_pid);
-		break;
-	}
-	return (0);
-}
-
-vdoualarm(arg)
-	int arg;
-{
-	register struct proc *p;
-
-	p = pfind(arg);
-	if (p)
-		psignal(p, 16);
-	nvualarm--;
-}
-#endif
-
 sys_sysarch(p, v, retval)
 	struct proc *p;
 	void *v;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 0588efe6b1f..1c44bc1c9da 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_bio.c,v 1.26 1999/12/05 08:09:01 art Exp $	*/
+/*	$OpenBSD: vfs_bio.c,v 1.27 2000/06/23 02:14:38 mickey Exp $	*/
 /*	$NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $	*/
 
 /*-
@@ -55,7 +55,6 @@
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
-#include <sys/trace.h>
 #include <sys/malloc.h>
 #include <sys/resourcevar.h>
 #include <sys/conf.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index bb6de8a9b56..0c433c72b83 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_cluster.c,v 1.16 1999/01/11 05:12:24 millert Exp $	*/
+/*	$OpenBSD: vfs_cluster.c,v 1.17 2000/06/23 02:14:38 mickey Exp $	*/
 /*	$NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $	*/
 
 /*-
@@ -41,7 +41,6 @@
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
-#include <sys/trace.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
@@ -128,14 +127,12 @@ cluster_read(vp, filesize, lblkno, size, cred, bpp)
 		 * Desired block is in cache; do any readahead ASYNC.
 		 * Case 1, 2.
 		 */
-		trace(TR_BREADHIT, pack(vp, size), lblkno);
 		flags |= B_ASYNC;
 		ioblkno = lblkno + (vp->v_ralen ? vp->v_ralen : 1);
 		alreadyincore = incore(vp, ioblkno) != NULL;
 		bp = NULL;
 	} else {
 		/* Block wasn't in cache, case 3, 4, 5. */
-		trace(TR_BREADMISS, pack(vp, size), lblkno);
 		bp->b_flags |= B_READ;
 		ioblkno = lblkno;
 		alreadyincore = 0;
@@ -232,11 +229,8 @@ cluster_read(vp, filesize, lblkno, size, cred, bpp)
 
 		if (rbp == bp)			/* case 4 */
 			rbp = NULL;
-		else if (rbp) {			/* case 2, 5 */
-			trace(TR_BREADMISSRA,
-			    pack(vp, (num_ra + 1) * size), ioblkno);
+		else if (rbp)			/* case 2, 5 */
 			curproc->p_stats->p_ru.ru_inblock++;	/* XXX */
-		}
 	}
 
 	/* XXX Kirk, do we need to make sure the bp has creds? */
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 911ff3522fa..a216e9a87e0 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_bio.c,v 1.15 1999/02/26 03:16:25 art Exp $	*/
+/*	$OpenBSD: nfs_bio.c,v 1.16 2000/06/23 02:14:40 mickey Exp $	*/
 /*	$NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $	*/
 
 /*
@@ -47,7 +47,6 @@
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <sys/trace.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/namei.h>
diff --git a/sys/sys/trace.h b/sys/sys/trace.h
deleted file mode 100644
index fa5b3011cfe..00000000000
--- a/sys/sys/trace.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*	$OpenBSD: trace.h,v 1.2 1996/03/03 12:12:31 niklas Exp $	*/
-/*	$NetBSD: trace.h,v 1.7 1995/03/26 20:24:56 jtc Exp $	*/
-
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)trace.h	8.1 (Berkeley) 6/2/93
- */
-
-/*
- * File system buffer tracing points; all trace <pack(dev, size), bn>
- */
-#define	TR_BREADHIT	0	/* buffer read found in cache */
-#define	TR_BREADMISS	1	/* buffer read not in cache */
-#define	TR_BWRITE	2	/* buffer written */
-#define	TR_BREADHITRA	3	/* buffer read-ahead found in cache */
-#define	TR_BREADMISSRA	4	/* buffer read-ahead not in cache */
-#define	TR_XFODMISS	5	/* exe fod read */
-#define	TR_XFODHIT	6	/* exe fod read */
-#define	TR_BRELSE	7	/* brelse */
-#define	TR_BREALLOC	8	/* expand/contract a buffer */
-
-/*
- * Memory allocator trace points; all trace the amount of memory involved
- */
-#define	TR_MALL		10	/* memory allocated */
-
-/*
- * Paging trace points: all are <vaddr, pid>
- */
-#define	TR_INTRANS	20	/* page intransit block */
-#define	TR_EINTRANS	21	/* page intransit wait done */
-#define	TR_FRECLAIM	22	/* reclaim from free list */
-#define	TR_RECLAIM	23	/* reclaim from loop */
-#define	TR_XSFREC	24	/* reclaim from free list instead of drum */
-#define	TR_XIFREC	25	/* reclaim from free list instead of fsys */
-#define	TR_WAITMEM	26	/* wait for memory in pagein */
-#define	TR_EWAITMEM	27	/* end memory wait in pagein */
-#define	TR_ZFOD		28	/* zfod page fault */
-#define	TR_EXFOD	29	/* exec fod page fault */
-#define	TR_VRFOD	30	/* vread fod page fault */
-#define	TR_CACHEFOD	31	/* fod in file system cache */
-#define	TR_SWAPIN	32	/* drum page fault */
-#define	TR_PGINDONE	33	/* page in done */
-#define	TR_SWAPIO	34	/* swap i/o request arrives */
-
-/*
- * System call trace points.
- */
-#define	TR_VADVISE	40	/* vadvise occurred with <arg, pid> */
-
-/*
- * Miscellaneous
- */
-#define	TR_STAMP	45	/* user said vtrace(VTR_STAMP, value); */
-
-/*
- * This defines the size of the trace flags array.
- */
-#define	TR_NFLAGS	100	/* generous */
-
-#define	TRCSIZ		4096
-
-/*
- * Specifications of the vtrace() system call, which takes one argument.
- */
-#define	VTRACE		64+51
-
-#define	VTR_DISABLE	0		/* set a trace flag to 0 */
-#define	VTR_ENABLE	1		/* set a trace flag to 1 */
-#define	VTR_VALUE	2		/* return value of a trace flag */
-#define	VTR_UALARM	3		/* set alarm to go off (sig 16) */
-					/* in specified number of hz */
-#define	VTR_STAMP	4		/* user specified stamp */
-
-#ifdef _KERNEL
-#ifdef TRACE
-struct	proc *traceproc;
-int	tracewhich, tracebuf[TRCSIZ];
-u_int	tracex;
-char	traceflags[TR_NFLAGS];
-#define	pack(v,b)	(((v)->v_mount->mnt_stat.f_fsid.val[0])<<16)|(b)
-#define	trace(a,b,c) {							\
-	if (traceflags[a])						\
-		trace1(a,b,c);						\
-}
-#else
-#define	trace(a,b,c)
-#endif
-#endif
diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c
index ce8dfa15968..1c2dd292ef6 100644
--- a/sys/ufs/ext2fs/ext2fs_bmap.c
+++ b/sys/ufs/ext2fs/ext2fs_bmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_bmap.c,v 1.4 1999/04/25 00:36:46 millert Exp $	*/
+/*	$OpenBSD: ext2fs_bmap.c,v 1.5 2000/06/23 02:14:39 mickey Exp $	*/
 /*	$NetBSD: ext2fs_bmap.c,v 1.1 1997/06/11 09:33:46 bouyer Exp $	*/
 
 /*
@@ -50,7 +50,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
-#include <sys/trace.h>
 
 #include <miscfs/specfs/specdev.h>
 
@@ -188,14 +187,13 @@ ext2fs_bmaparray(vp, bn, bnp, ap, nump, runp)
 		xap->in_exists = 1;
 		bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0);
 		if (bp->b_flags & (B_DONE | B_DELWRI)) {
-			trace(TR_BREADHIT, pack(vp, size), metalbn);
+			;
 		}
 #ifdef DIAGNOSTIC
 		else if (!daddr)
 			panic("ext2fs_bmaparry: indirect block not in cache");
 #endif
 		else {
-			trace(TR_BREADMISS, pack(vp, size), metalbn);
 			bp->b_blkno = blkptrtodb(ump, daddr);
 			bp->b_flags |= B_READ;
 			VOP_STRATEGY(bp);
diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index d97a1290e96..a110763457e 100644
--- a/sys/ufs/ext2fs/ext2fs_inode.c
+++ b/sys/ufs/ext2fs/ext2fs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_inode.c,v 1.8 2000/04/26 23:24:41 jasoni Exp $	*/
+/*	$OpenBSD: ext2fs_inode.c,v 1.9 2000/06/23 02:14:39 mickey Exp $	*/
 /*	$NetBSD: ext2fs_inode.c,v 1.1 1997/06/11 09:33:56 bouyer Exp $	*/
 
 /*
@@ -47,7 +47,6 @@
 #include <sys/vnode.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/trace.h>
 #include <sys/resourcevar.h>
 
 #include <vm/vm.h>
@@ -441,11 +440,7 @@ ext2fs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	 */
 	vp = ITOV(ip);
 	bp = getblk(vp, lbn, (int)fs->e2fs_bsize, 0, 0);
-	if (bp->b_flags & (B_DONE | B_DELWRI)) {
-		/* Braces must be here in case trace evaluates to nothing. */
-		trace(TR_BREADHIT, pack(vp, fs->e2fs_bsize), lbn);
-	} else {
-		trace(TR_BREADMISS, pack(vp, fs->e2fs_bsize), lbn);
+	if (!(bp->b_flags & (B_DONE | B_DELWRI))) {
 		curproc->p_stats->p_ru.ru_inblock++;	/* pay for read */
 		bp->b_flags |= B_READ;
 		if (bp->b_bcount > bp->b_bufsize)
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 225ccc23acb..b9f1ad90b8d 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_inode.c,v 1.15 1999/12/06 07:23:21 art Exp $	*/
+/*	$OpenBSD: ffs_inode.c,v 1.16 2000/06/23 02:14:39 mickey Exp $	*/
 /*	$NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 #include <sys/vnode.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/trace.h>
 #include <sys/resourcevar.h>
 
 #include <vm/vm.h>
@@ -490,11 +489,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	 */
 	vp = ITOV(ip);
 	bp = getblk(vp, lbn, (int)fs->fs_bsize, 0, 0);
-	if (bp->b_flags & (B_DONE | B_DELWRI)) {
-		/* Braces must be here in case trace evaluates to nothing. */
-		trace(TR_BREADHIT, pack(vp, fs->fs_bsize), lbn);
-	} else {
-		trace(TR_BREADMISS, pack(vp, fs->fs_bsize), lbn);
+	if (!(bp->b_flags & (B_DONE | B_DELWRI))) {
 		curproc->p_stats->p_ru.ru_inblock++;	/* pay for read */
 		bp->b_flags |= B_READ;
 		if (bp->b_bcount > bp->b_bufsize)
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index e51cf1a6135..c688fa665b7 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_bmap.c,v 1.8 2000/03/13 14:07:54 art Exp $	*/
+/*	$OpenBSD: ufs_bmap.c,v 1.9 2000/06/23 02:14:39 mickey Exp $	*/
 /*	$NetBSD: ufs_bmap.c,v 1.3 1996/02/09 22:36:00 christos Exp $	*/
 
 /*
@@ -48,7 +48,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
-#include <sys/trace.h>
 
 #include <miscfs/specfs/specdev.h>
 
@@ -181,14 +180,13 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
 		xap->in_exists = 1;
 		bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0);
 		if (bp->b_flags & (B_DONE | B_DELWRI)) {
-			trace(TR_BREADHIT, pack(vp, size), metalbn);
+			;
 		}
 #ifdef DIAGNOSTIC
 		else if (!daddr)
 			panic("ufs_bmaparray: indirect block not in cache");
 #endif
 		else {
-			trace(TR_BREADMISS, pack(vp, size), metalbn);
 			bp->b_blkno = blkptrtodb(ump, daddr);
 			bp->b_flags |= B_READ;
 			VOP_STRATEGY(bp);