From ea559fb5736cd469eb7c73586b604e2c9de3e02c Mon Sep 17 00:00:00 2001
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 18 Sep 2012 08:00:56 +0000
Subject: [PATCH] zfs: allow both DEBUG and ZFS_DEBUG to be defined on command
 line

Discussed with:	pjd
MFC after:	10 days
---
 sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h | 2 ++
 1 file changed, 2 insertions(+)

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 708b60004a2..43d037d7b07 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;