From owner-svn-src-head@FreeBSD.ORG  Sun Nov 14 20:23:02 2010
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 B13AF10656B8;
	Sun, 14 Nov 2010 20:23:02 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 807B08FC13;
	Sun, 14 Nov 2010 20:23:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAEKN28r092724;
	Sun, 14 Nov 2010 20:23:02 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAEKN2qB092721;
	Sun, 14 Nov 2010 20:23:02 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201011142023.oAEKN2qB092721@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 14 Nov 2010 20:23:02 +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: r215316 - in head/sys: net 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: Sun, 14 Nov 2010 20:23:02 -0000

Author: dim
Date: Sun Nov 14 20:23:02 2010
New Revision: 215316
URL: http://svn.freebsd.org/changeset/base/215316

Log:
  Add macros to define static instances of VNET_DEFINE and DPCPU_DEFINE.

Modified:
  head/sys/net/vnet.h
  head/sys/sys/pcpu.h

Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h	Sun Nov 14 20:14:25 2010	(r215315)
+++ head/sys/net/vnet.h	Sun Nov 14 20:23:02 2010	(r215316)
@@ -196,8 +196,10 @@ extern struct sx vnet_sxlock;
 #define	VNET_NAME(n)		vnet_entry_##n
 #define	VNET_DECLARE(t, n)	extern t VNET_NAME(n)
 #define	VNET_DEFINE(t, n)	t VNET_NAME(n) __section(VNET_SETNAME) __used
-#define	_VNET_PTR(b, n)		(__typeof(VNET_NAME(n))*)		\
-				    ((b) + (uintptr_t)&VNET_NAME(n))
+#define	STATIC_VNET_DEFINE(t, n)					\
+    VNET_DEFINE(static t, n)
+#define	_VNET_PTR(b, n)							\
+    (__typeof(VNET_NAME(n))*)((b) + (uintptr_t)&VNET_NAME(n))
 
 #define	_VNET(b, n)		(*_VNET_PTR(b, n))
 
@@ -371,10 +373,11 @@ do {									\
  * Versions of the VNET macros that compile to normal global variables and
  * standard sysctl definitions.
  */
-#define	VNET_NAME(n)		n
-#define	VNET_DECLARE(t, n)	extern t n
-#define	VNET_DEFINE(t, n)	t n
-#define	_VNET_PTR(b, n)		&VNET_NAME(n)
+#define	VNET_NAME(n)			n
+#define	VNET_DECLARE(t, n)		extern t n
+#define	VNET_DEFINE(t, n)		t n
+#define	STATIC_VNET_DEFINE(t, n)	static t n
+#define	_VNET_PTR(b, n)			&VNET_NAME(n)
 
 /*
  * Virtualized global variable accessor macros.

Modified: head/sys/sys/pcpu.h
==============================================================================
--- head/sys/sys/pcpu.h	Sun Nov 14 20:14:25 2010	(r215315)
+++ head/sys/sys/pcpu.h	Sun Nov 14 20:23:02 2010	(r215316)
@@ -76,6 +76,8 @@ extern uintptr_t dpcpu_off[];
 #define	DPCPU_NAME(n)		pcpu_entry_##n
 #define	DPCPU_DECLARE(t, n)	extern t DPCPU_NAME(n)
 #define	DPCPU_DEFINE(t, n)	t DPCPU_NAME(n) __section(DPCPU_SETNAME) __used
+#define	STATIC_DPCPU_DEFINE(t, n)					\
+    DPCPU_DEFINE(static t, n)
 
 /*
  * Accessors with a given base.