From owner-svn-src-all@FreeBSD.ORG  Thu Dec 11 15:44:53 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C057E1065680;
	Thu, 11 Dec 2008 15:44:53 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF8408FC16;
	Thu, 11 Dec 2008 15:44:53 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBFirkU068919;
	Thu, 11 Dec 2008 15:44:53 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBBFir50068918;
	Thu, 11 Dec 2008 15:44:53 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200812111544.mBBFir50068918@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 11 Dec 2008 15:44:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185932 - head/sys/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Dec 2008 15:44:53 -0000

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.
  
  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