PERFORCE change 160618 for review

[Marko Zec]

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

Change 160618 by zec at zec_amdx2 on 2009/04/14 16:38:05

	Unbreak LINT + VIMAGE_GLOBALS build.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#79 edit
.. //depot/projects/vimage/src/sys/net/route.c#46 edit
.. //depot/projects/vimage/src/sys/netinet/accf_http.c#10 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#79 edit
.. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#30 edit

Differences ...

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

@@ -848,6 +848,7 @@
 }
 #endif /* VIMAGE */
 
+#ifndef VIMAGE_GLOBALS
 static void
 vi_init(void *unused)
 {
@@ -897,6 +898,7 @@
 
 SYSINIT(vimage, SI_SUB_VIMAGE, SI_ORDER_FIRST, vi_init, NULL);
 SYSINIT(vimage_done, SI_SUB_VIMAGE_DONE, SI_ORDER_FIRST, vi_init_done, NULL);
+#endif /* !VIMAGE_GLOBALS */
 
 #ifdef VIMAGE
 #ifdef DDB

==== //depot/projects/vimage/src/sys/net/route.c#46 (text+ko) ====

@@ -178,7 +178,7 @@
 #ifndef VIMAGE_GLOBALS
 	vnet_mod_register(&vnet_rtable_modinfo);
 #else
-	rtable_init(NULL);
+	vnet_route_iattach(NULL);
 #endif
 }
 

==== //depot/projects/vimage/src/sys/netinet/accf_http.c#10 (text+ko) ====

@@ -95,12 +95,14 @@
 
 static vnet_attach_fn vnet_accf_http_iattach;
 
+#ifndef VIMAGE_GLOBALS
 vnet_modinfo_t vnet_accf_http_modinfo = {
 	.vmi_id		= VNET_MOD_ACCF_HTTP,
 	.vmi_name	= "accf_http",
 	.vmi_dependson	= VNET_MOD_INET,
 	.vmi_iattach	= vnet_accf_http_iattach
 };
+#endif
 
 SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0,
 "HTTP accept filter");

==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#79 (text+ko) ====

@@ -282,10 +282,6 @@
 #define	ISN_LOCK()	mtx_lock(&isn_mtx)
 #define	ISN_UNLOCK()	mtx_unlock(&isn_mtx)
 
-#ifdef VIMAGE_GLOBALS
-static uma_zone_t tcpcb_zone;
-#endif
-
 /*
  * TCP initialization.
  */

==== //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#30 (text+ko) ====

@@ -732,7 +732,7 @@
 #ifndef VIMAGE_GLOBALS
 	vnet_mod_register(&vnet_ipip_modinfo);
 #else
-	ipip_iattach(NULL);
+	ipe4_iattach(NULL);
 #endif
 }
 SYSINIT(ipe4_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ipe4_attach, NULL);