From 4fbdc85400a6de487e542a9664bbae51e254f8aa Mon Sep 17 00:00:00 2001
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 24 Aug 2010 13:21:05 +0000
Subject: [PATCH] Enable fasttrap and make dtraceall depend on fasttrap when
 building i386 or amd64.

Sponsored by:	The FreeBSD Foundation
---
 sys/modules/dtrace/Makefile              | 2 +-
 sys/modules/dtrace/dtraceall/dtraceall.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile
index 75d4a44dcab..02c476697c6 100644
--- a/sys/modules/dtrace/Makefile
+++ b/sys/modules/dtrace/Makefile
@@ -15,7 +15,7 @@ SUBDIR=		dtmalloc	\
 		systrace
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-SUBDIR+=	fbt
+SUBDIR+=	fasttrap fbt
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c
index d8d330fda30..ecb5e344b03 100644
--- a/sys/modules/dtrace/dtraceall/dtraceall.c
+++ b/sys/modules/dtrace/dtraceall/dtraceall.c
@@ -68,6 +68,7 @@ MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1);
 #if defined(__amd64__) || defined(__i386__)
 MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
+MODULE_DEPEND(dtraceall, fasttrap, 1, 1, 1);
 #endif
 MODULE_DEPEND(dtraceall, lockstat, 1, 1, 1);
 MODULE_DEPEND(dtraceall, sdt, 1, 1, 1);