From owner-p4-projects@FreeBSD.ORG  Fri May  8 16:20:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E8A651065673; Fri,  8 May 2009 16:20:41 +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 A362A1065670
	for <perforce@freebsd.org>; Fri,  8 May 2009 16:20:41 +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 916C98FC0A
	for <perforce@freebsd.org>; Fri,  8 May 2009 16:20:41 +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 n48GKfmW063600
	for <perforce@freebsd.org>; Fri, 8 May 2009 16:20:41 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n48GKfX8063598
	for perforce@freebsd.org; Fri, 8 May 2009 16:20:41 GMT
	(envelope-from zec@fer.hr)
Date: Fri, 8 May 2009 16:20:41 GMT
Message-Id: <200905081620.n48GKfX8063598@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 161779 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, 08 May 2009 16:20:42 -0000

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

Change 161779 by zec@zec_tpx32 on 2009/05/08 16:20:32

	Unbreak GENERIC & VIMAGE builds.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#32 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#57 edit

Differences ...

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

@@ -63,8 +63,10 @@
 static int vnet_mod_constructor(struct vnet_modlink *);
 static int vnet_mod_destructor(struct vnet_modlink *);
 
+#ifdef VIMAGE
 static struct vimage *vimage_by_name(struct vimage *, char *);
 static struct vimage *vi_alloc(struct vimage *, char *);
+#endif
 
 #define	VNET_LIST_LOCK()						\
 	mtx_lock(&vnet_list_refc_mtx);					\
@@ -82,7 +84,9 @@
 #ifndef VIMAGE_GLOBALS
 struct vprocg vprocg_0;
 #endif
+#endif
 
+#ifdef VIMAGE
 struct cv vnet_list_condvar;
 struct mtx vnet_list_refc_mtx;
 int vnet_list_refc = 0;
@@ -90,12 +94,9 @@
 static u_int last_vi_id = 0;
 static u_int last_vnet_id = 0;
 static u_int last_vprocg_id = 0;
-#else
-#ifndef VIMAGE_GLOBALS
-struct vprocg vprocg_0;
 #endif
-#endif
 
+#ifdef VIMAGE
 /*
  * Userspace interfaces.
  */
@@ -430,6 +431,8 @@
 	return (error);
 }
 
+#endif /* VIMAGE */ /* User interface block */
+
 
 /*
  * Kernel interfaces and handlers.
@@ -666,6 +669,7 @@
 	return (ENOENT);
 }
 
+#ifdef VIMAGE
 static struct vimage *
 vi_alloc(struct vimage *parent, char *name)
 {
@@ -727,6 +731,7 @@
 vi_alloc_done:
 	return (vip);
 }
+#endif /* VIMAGE */
 
 static void
 vi_init(void *unused)

==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#57 (text+ko) ====

@@ -210,7 +210,7 @@
 	LIST_ENTRY(vnet)	 vnet_le;	/* all vnets list */
 	u_int			 vnet_magic_n;
 	u_int			 vnet_id;	/* ID num */
-	u_int			 ifccnt;
+	u_int			 ifcnt;
 	u_int			 sockcnt;
 };