svn commit: r185932 - head/sys/sys

[Bjoern A. Zeeb]

On Thu, 11 Dec 2008, Bjoern A. Zeeb wrote:

> Author: bz
> Date: Thu Dec 11 15:44:53 2008
> New Revision: 185932
> URL: http://svn.freebsd.org/changeset/base/185932
>
> Log:
>  Error in case anyone tried to compile with both options VIMAGE and
>  the (temporary) option VIMAGE_GLOBALS.


Hi,

in case anyone wonders what those options mean, do or ill do,
there is a wiki page here:
 	http://wiki.freebsd.org/Image/KernelOptions



>  Sponsored by:	The FreeBSD Foundation:
>
> Modified:
>  head/sys/sys/vimage.h
>
> Modified: head/sys/sys/vimage.h
> ==============================================================================
> --- head/sys/sys/vimage.h	Thu Dec 11 15:42:59 2008	(r185931)
> +++ head/sys/sys/vimage.h	Thu Dec 11 15:44:53 2008	(r185932)
> @@ -60,6 +60,10 @@ struct vnet_modlink {
> 		.vmi_symmap		= m_symmap			\
> };
>
> +#if defined(VIMAGE) && defined(VIMAGE_GLOBALS)
> +#error "You cannot have both option VIMAGE and option VIMAGE_GLOBALS!"
> +#endif
> +
> #ifdef VIMAGE_GLOBALS
> #define	VSYM(base, sym) (sym)
> #else
>

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