From owner-svn-src-head@FreeBSD.ORG  Thu Dec 11 17:00:09 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DBBAA1065673;
	Thu, 11 Dec 2008 17:00:08 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A0558FC1F;
	Thu, 11 Dec 2008 17:00:08 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from localhost (amavis.str.cksoft.de [192.168.74.71])
	by mail.cksoft.de (Postfix) with ESMTP id C1F4941C735;
	Thu, 11 Dec 2008 18:00:06 +0100 (CET)
X-Virus-Scanned: amavisd-new at cksoft.de
Received: from mail.cksoft.de ([62.111.66.27])
	by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new,
	port 10024)
	with ESMTP id PyE3-VK0sEcm; Thu, 11 Dec 2008 18:00:06 +0100 (CET)
Received: by mail.cksoft.de (Postfix, from userid 66)
	id 72CAC41C734; Thu, 11 Dec 2008 18:00:06 +0100 (CET)
Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net
	[10.111.66.10])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.int.zabbadoz.net (Postfix) with ESMTP id 5F2EC4448DD;
	Thu, 11 Dec 2008 16:57:24 +0000 (UTC)
Date: Thu, 11 Dec 2008 16:57:24 +0000 (UTC)
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
X-X-Sender: bz@maildrop.int.zabbadoz.net
To: src-committers@freebsd.org, svn-src-all@freebsd.org, 
	svn-src-head@freebsd.org
In-Reply-To: <200812111544.mBBFir50068918@svn.freebsd.org>
Message-ID: <20081211165343.T97918@maildrop.int.zabbadoz.net>
References: <200812111544.mBBFir50068918@svn.freebsd.org>
X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: 
Subject: Re: svn commit: r185932 - head/sys/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Dec 2008 17:00:09 -0000

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.