summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2012-09-18 08:00:56 +0000
committeravg <avg@FreeBSD.org>2012-09-18 08:00:56 +0000
commit63f3204e0bd5413143ec9f71bf54d4722c9ef46a (patch)
tree0efe2a9b57c53e39e11ad2e6b1f933ed1f551f38 /sys/cddl
parent2e8dd1a5206b006b0cca29118603ce42c75628cf (diff)
downloadFreeBSD-src-63f3204e0bd5413143ec9f71bf54d4722c9ef46a.zip
FreeBSD-src-63f3204e0bd5413143ec9f71bf54d4722c9ef46a.tar.gz
zfs: allow both DEBUG and ZFS_DEBUG to be defined on command line
Discussed with: pjd MFC after: 10 days
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
index 708b600..43d037d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
@@ -43,8 +43,10 @@ extern "C" {
*/
#if defined(DEBUG) || !defined(_KERNEL)
+#if !defined(ZFS_DEBUG)
#define ZFS_DEBUG
#endif
+#endif
extern int zfs_flags;
OpenPOWER on IntegriCloud