From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 06:35:28 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id B39D6A30; Mon, 22 Oct 2012 06:35:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5AED9951
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 06:35:28 +0000 (UTC)
 (envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 40E888FC22
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 06:35:28 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q9M6ZSjG082223
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 06:35:28 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q9M6ZRXp082220
 for perforce@freebsd.org; Mon, 22 Oct 2012 06:35:27 GMT
 (envelope-from jhb@freebsd.org)
Date: Mon, 22 Oct 2012 06:35:27 GMT
Message-Id: <201210220635.q9M6ZRXp082220@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 218783 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 06:35:28 -0000

http://p4web.freebsd.org/@@218783?ac=10

Change 218783 by jhb@jhb_ralph on 2012/10/20 03:28:49

	Mismerge.

Affected files ...

.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/debug.h#3 edit

Differences ...

==== //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/debug.h#3 (text+ko) ====

@@ -23,26 +23,20 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/debug.h,v 1.2 2008/03/28 22:16:06 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/debug.h,v 1.4 2012/09/12 18:05:43 mm Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_DEBUG_H_
 #define	_OPENSOLARIS_SYS_DEBUG_H_
 
 #ifdef _KERNEL
-#include <sys/types.h>
 #include <sys/systm.h>
 
 #include_next <sys/debug.h>
-
-#define	assfail(a, f, l)						\
-	(panic("solaris assert: %s, file: %s, line: %d", (a), (f), (l)), 0)
+#else	/* !_KERNEL */
 
-#define	assfail3(a, lv, op, rv, f, l)					\
-	panic("solaris assert: %s (0x%jx %s 0x%jx), file: %s, line: %d", \
-	    (a), (uintmax_t)(lv), (op), (uintmax_t)(rv), (f), (l))
-#else	/* !_KERNEL */
 #include_next <sys/debug.h>
-#endif
+#include <sys/assfail.h>
+#endif	/* _KERNEL */
 
 #endif	/* _OPENSOLARIS_SYS_DEBUG_H_ */