After some off-list discussion, revert a number of changes to the

DPCPU_DEFINE and VNET_DEFINE macros, as these cause problems for various
people working on the affected files.  A better long-term solution is
still being considered.  This reversal may give some modules empty
set_pcpu or set_vnet sections, but these are harmless.

Changes reverted:

------------------------------------------------------------------------
r215318 | dim | 2010-11-14 21:40:55 +0100 (Sun, 14 Nov 2010) | 4 lines

Instead of unconditionally emitting .globl's for the __start_set_xxx and
__stop_set_xxx symbols, only emit them when the set_vnet or set_pcpu
sections are actually defined.

------------------------------------------------------------------------
r215317 | dim | 2010-11-14 21:38:11 +0100 (Sun, 14 Nov 2010) | 3 lines

Apply the STATIC_VNET_DEFINE and STATIC_DPCPU_DEFINE macros throughout
the tree.

------------------------------------------------------------------------
r215316 | dim | 2010-11-14 21:23:02 +0100 (Sun, 14 Nov 2010) | 2 lines

Add macros to define static instances of VNET_DEFINE and DPCPU_DEFINE.

1 files changed, 13 insertions, 13 deletions

diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index fe4f160..b02d30b 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -206,11 +206,11 @@ MALLOC_DEFINE(M_IGMP, "igmp", "igmp state");
  * FUTURE: Stop using IFP_TO_IA/INADDR_ANY, and use source address selection
  * policy to control the address used by IGMP on the link.
  */
-STATIC_VNET_DEFINE(int, interface_timers_running);	/* IGMPv3 general
+static VNET_DEFINE(int, interface_timers_running);	/* IGMPv3 general
 							 * query response */
-STATIC_VNET_DEFINE(int, state_change_timers_running);	/* IGMPv3 state-change
+static VNET_DEFINE(int, state_change_timers_running);	/* IGMPv3 state-change
 							 * retransmit */
-STATIC_VNET_DEFINE(int, current_state_timers_running);	/* IGMPv1/v2 host
+static VNET_DEFINE(int, current_state_timers_running);	/* IGMPv1/v2 host
 							 * report; IGMPv3 g/sg
 							 * query response */
 
@@ -218,24 +218,24 @@ STATIC_VNET_DEFINE(int, current_state_timers_running);	/* IGMPv1/v2 host
 #define	V_state_change_timers_running	VNET(state_change_timers_running)
 #define	V_current_state_timers_running	VNET(current_state_timers_running)
 
-STATIC_VNET_DEFINE(LIST_HEAD(, igmp_ifinfo), igi_head);
-STATIC_VNET_DEFINE(struct igmpstat, igmpstat) = {
+static VNET_DEFINE(LIST_HEAD(, igmp_ifinfo), igi_head);
+static VNET_DEFINE(struct igmpstat, igmpstat) = {
 	.igps_version = IGPS_VERSION_3,
 	.igps_len = sizeof(struct igmpstat),
 };
-STATIC_VNET_DEFINE(struct timeval, igmp_gsrdelay) = {10, 0};
+static VNET_DEFINE(struct timeval, igmp_gsrdelay) = {10, 0};
 
 #define	V_igi_head			VNET(igi_head)
 #define	V_igmpstat			VNET(igmpstat)
 #define	V_igmp_gsrdelay			VNET(igmp_gsrdelay)
 
-STATIC_VNET_DEFINE(int, igmp_recvifkludge) = 1;
-STATIC_VNET_DEFINE(int, igmp_sendra) = 1;
-STATIC_VNET_DEFINE(int, igmp_sendlocal) = 1;
-STATIC_VNET_DEFINE(int, igmp_v1enable) = 1;
-STATIC_VNET_DEFINE(int, igmp_v2enable) = 1;
-STATIC_VNET_DEFINE(int, igmp_legacysupp);
-STATIC_VNET_DEFINE(int, igmp_default_version) = IGMP_VERSION_3;
+static VNET_DEFINE(int, igmp_recvifkludge) = 1;
+static VNET_DEFINE(int, igmp_sendra) = 1;
+static VNET_DEFINE(int, igmp_sendlocal) = 1;
+static VNET_DEFINE(int, igmp_v1enable) = 1;
+static VNET_DEFINE(int, igmp_v2enable) = 1;
+static VNET_DEFINE(int, igmp_legacysupp);
+static VNET_DEFINE(int, igmp_default_version) = IGMP_VERSION_3;
 
 #define	V_igmp_recvifkludge		VNET(igmp_recvifkludge)
 #define	V_igmp_sendra			VNET(igmp_sendra)