shrink extra verbose crud

2 files changed, 14 insertions, 7 deletions

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 0ff8b550726..268ccba2a2c 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.90 2004/11/02 21:20:56 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.91 2005/04/28 17:19:27 deraadt Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -561,6 +561,7 @@ nobootinfo:
 #endif /* _PMAP_MAY_USE_PROM_CONSOLE */
 	}
 
+#ifdef DEBUG
 	/*
 	 * Dump out the MDDT if it looks odd...
 	 */
@@ -586,6 +587,7 @@ nobootinfo:
 		}
 		printf("\n");
 	}
+#endif
 
 	if (totalphysmem == 0)
 		panic("can't happen: system seems to have no memory!");
@@ -1342,7 +1344,7 @@ dumpsys()
 
 err:
 	switch (error) {
-
+#ifdef DEBUG
 	case ENXIO:
 		printf("device bad\n");
 		break;
@@ -1362,7 +1364,7 @@ err:
 	case EINTR:
 		printf("aborted from console\n");
 		break;
-
+#endif /* DEBUG */
 	case 0:
 		printf("succeeded\n");
 		break;
@@ -1725,7 +1727,7 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 	case CPU_ROOT_DEVICE:
 		return (sysctl_rdstring(oldp, oldlenp, newp,
 		    root_device));
-
+#ifndef SMALL_KERNEL
 	case CPU_UNALIGNED_PRINT:
 		return (sysctl_int(oldp, oldlenp, newp, newlen,
 		    &alpha_unaligned_print));
@@ -1745,6 +1747,7 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 	case CPU_CHIPSET:
 		return (alpha_sysctl_chipset(name + 1, namelen - 1, oldp,
 		    oldlenp));
+#endif /* SMALL_KERNEL */
 
 #ifndef NO_IEEE
 	case CPU_FP_SYNC_COMPLETE:
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index ef7c1ae6da4..2b4060a6a5e 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.45 2005/04/21 04:39:34 mickey Exp $ */
+/* $OpenBSD: trap.c,v 1.46 2005/04/28 17:19:27 deraadt Exp $ */
 /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */
 
 /*-
@@ -146,9 +146,10 @@ struct device fpevent_use;
 struct device fpevent_reuse;
 #endif
 
+#ifdef DEBUG
 static void printtrap(const unsigned long, const unsigned long,
       const unsigned long, const unsigned long, struct trapframe *, int, int);
-
+#endif /* DEBUG */
 /*
  * Initialize the trap vectors for the current processor.
  */
@@ -219,6 +220,7 @@ userret(p, pc, oticks)
 	curpriority = p->p_priority;
 }
 
+#ifdef DEBUG
 static void
 printtrap(a0, a1, a2, entry, framep, isfatal, user)
 	const unsigned long a0, a1, a2, entry;
@@ -269,6 +271,7 @@ printtrap(a0, a1, a2, entry, framep, isfatal, user)
 		       curproc->p_comm);
 	printf("\n");
 }
+#endif /* DEBUG */
 
 /*
  * Trap is called from locore to handle most types of processor traps.
@@ -539,8 +542,9 @@ out:
 	return;
 
 dopanic:
+#ifdef DEBUG
 	printtrap(a0, a1, a2, entry, framep, 1, user);
-
+#endif
 	/* XXX dump registers */
 
 #if defined(DDB)