1 files changed, 8 insertions, 3 deletions
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index ad4270b..814517a 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_ddb.h"
 #include "opt_kstack_pages.h"
 #include "opt_sched.h"
+#include "opt_xtrace.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -177,9 +178,6 @@ void (*cpu_idle_hook)(sbintime_t) = NULL;
 
 struct kva_md_info kmi;
 
-#define	Mhz	1000000L
-#define	Ghz	(1000L*Mhz)
-
 static void
 identifycpu(void)
 {
@@ -566,6 +564,9 @@ void
 kdb_cpu_trap(int vector, int code __unused)
 {
 
+#ifdef XTRACE
+	ia64_xtrace_stop();
+#endif
 	__asm __volatile("flushrs;;");
 
 	/* Restart after the break instruction. */
@@ -892,6 +893,10 @@ ia64_init(void)
 	 */
 	pmap_bootstrap();
 
+#ifdef XTRACE
+	ia64_xtrace_init_bsp();
+#endif
+
 	/*
 	 * Initialize debuggers, and break into them if appropriate.
 	 */