svn commit: r241269 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys

[Andriy Gapon]

Author: avg
Date: Sat Oct  6 18:55:54 2012
New Revision: 241269
URL: http://svn.freebsd.org/changeset/base/241269

Log:
  MFC r240631: zfs: allow both DEBUG and ZFS_DEBUG to be defined on
  command line

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/cddl/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h	Sat Oct  6 18:55:32 2012	(r241268)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h	Sat Oct  6 18:55:54 2012	(r241269)
@@ -42,8 +42,10 @@ extern "C" {
  */
 
 #if defined(DEBUG) || !defined(_KERNEL)
+#if !defined(ZFS_DEBUG)
 #define	ZFS_DEBUG
 #endif
+#endif
 
 extern int zfs_flags;