From owner-p4-projects@FreeBSD.ORG  Fri Apr 24 07:18:26 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8BF7C1065674; Fri, 24 Apr 2009 07:18:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D8F41065670
	for <perforce@freebsd.org>; Fri, 24 Apr 2009 07:18:25 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C8048FC16
	for <perforce@freebsd.org>; Fri, 24 Apr 2009 07:18:25 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3O7IOvE094190
	for <perforce@freebsd.org>; Fri, 24 Apr 2009 07:18:24 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3O7IOhM094188
	for perforce@freebsd.org; Fri, 24 Apr 2009 07:18:24 GMT
	(envelope-from zec@fer.hr)
Date: Fri, 24 Apr 2009 07:18:24 GMT
Message-Id: <200904240718.n3O7IOhM094188@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 161015 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Fri, 24 Apr 2009 07:18:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=161015

Change 161015 by zec@zec_tpx32 on 2009/04/24 07:17:53

	Enclose options VIMAGE specific lines in #ifdef, which
	prevented DEBUG_ORDERING to be compiled in in kern_vimage.c

Affected files ...

.. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#7 edit

Differences ...

==== //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#7 (text+ko) ====

@@ -184,8 +184,10 @@
 	if (vml->vml_iarg)
 		printf("/%s", vml->vml_iname);
 	printf(": ");
+#ifdef VIMAGE
 	if (vmi->vmi_struct_size)
 		printf("malloc(%zu); ", vmi->vmi_struct_size);
+#endif
 	if (vmi->vmi_iattach != NULL)
 		printf("iattach()");
 	printf("\n");
@@ -193,7 +195,7 @@
 
 #ifdef VIMAGE
 	if (vmi->vmi_struct_size) {
-		void *mem = malloc(vmi->vmi_struct_size, M_VNET,
+		void *mem = malloc(vmi->vmi_size, M_VNET,
 		    M_NOWAIT | M_ZERO);
 		if (mem == NULL) /* XXX should return error, not panic. */
 			panic("vi_alloc: malloc for %s\n", vmi->vmi_name);
@@ -220,8 +222,10 @@
 	printf(": ");
 	if (vmi->vmi_idetach != NULL)
 		printf("idetach(); ");
+#ifdef VIMAGE
 	if (vmi->vmi_size)
 		printf("free()");
+#endif
 	printf("\n");
 #endif