Date: Fri, 8 May 2009 16:20:41 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 161779 for review Message-ID: <200905081620.n48GKfX8063598@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905081620.n48GKfX8063598>