PERFORCE change 155159 for review

[Bjoern A. Zeeb]

On Tue, 23 Dec 2008, Marko Zec wrote:

> http://perforce.freebsd.org/chv.cgi?CH=155159
>
> Change 155159 by zec at zec_tca51 on 2008/12/23 09:42:41
>
> 	Misintegration - unbreak options VIMAGE_GLOBALS build.
>
> Affected files ...
>
> .. //depot/projects/vimage/src/sys/net/if.c#60 edit
>
> Differences ...
>
> ==== //depot/projects/vimage/src/sys/net/if.c#60 (text+ko) ====
>
> @@ -402,10 +402,6 @@
> {
> 	INIT_VNET_NET(curvnet);
>
> -#ifndef VIMAGE
> -	vnet_mod_register(&vnet_net_modinfo);
> -#endif
> -
> 	V_if_index = 0;
> 	V_ifindex_table = NULL;
> 	V_if_indexlim = 8;

This is sounds wrong as well.

In case of VIMAGE vnet_mod_register is called in if_init().
Then vnet_net_iattach will be called as well from vnet_mod_constructor()
and thus we are going to call vnet_mod_register() twice resulting in a
panic.  See p4 describe -du 154705 .

So the proper check would be.. ?

 	#if !defined(VIMAGE_GLOBALS) && !defined(VIMAGE)

Three tries, must be right now;-)

/bz

-- 
Bjoern A. Zeeb                      The greatest risk is not taking one.