diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c
index edc3c3def043..3688cbab8e6e 100644
--- a/sys/arch/hppa/hppa/trap.c
+++ b/sys/arch/hppa/hppa/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.23 2004/08/07 21:47:05 chs Exp $	*/
+/*	$NetBSD: trap.c,v 1.24 2005/02/17 14:19:49 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.23 2004/08/07 21:47:05 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.24 2005/02/17 14:19:49 tsutsui Exp $");
 
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
@@ -312,7 +312,7 @@ trap_kdebug(int type, int code, struct trapframe *frame)
 #define trap_kdebug(t, c, f)	(0)
 #endif	/* !KGDB && !DDB */
 
-#ifdef DIAGNOSTIC
+#if defined(DEBUG) || defined(USERTRACE)
 /*
  * These functions give a crude usermode backtrace.  They 
  * really only work when code has been compiled without 
@@ -400,7 +400,7 @@ user_backtrace(struct trapframe *tf, struct lwp *l, int type)
 	}
 	user_backtrace_raw(tf->tf_iioq_head, fp);
 }
-#endif /* DIAGNOSTIC */
+#endif /* DEBUG || USERTRACE */
 
 #ifdef DEBUG
 /*