From c92ef78663731c0d7c7ac70e92ac5478e5ff10cd Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 20 Nov 2015 16:18:27 +0000
Subject: [PATCH] DTrace is known to work on armv6, enable building it as a
 module.

Reviewed by:	imp
Sponsored by:	ABT Systems Ltd
Differential Revision:	https://reviews.freebsd.org/D4221
---
 sys/conf/kern.opts.mk | 5 ++++-
 sys/modules/Makefile  | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 2e77c4fbcf3..1a3a1fd5ea9 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -59,7 +59,10 @@ __DEFAULT_NO_OPTIONS = \
 
 # Things that don't work based on the CPU
 .if ${MACHINE_CPUARCH} == "arm"
-BROKEN_OPTIONS+= CDDL ZFS
+BROKEN_OPTIONS+= ZFS
+. if ${MACHINE_ARCH:Marmv6*} == ""
+BROKEN_OPTIONS+= CDDL
+. endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "mips"
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 98b7e6feebb..3a0be13c2b0 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -403,7 +403,8 @@ _autofs=	autofs
 .endif
 
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
+.if (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv6*} == "") && \
+	${MACHINE_CPUARCH} != "mips" && \
 	${MACHINE_CPUARCH} != "sparc64"
 SUBDIR+=	dtrace
 .endif