summaryrefslogtreecommitdiffstats
path: root/sys/netinet/siftr.c
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2010-11-22 19:32:54 +0000
committerdim <dim@FreeBSD.org>2010-11-22 19:32:54 +0000
commitfb307d7d1de2e083e767df27714dca5352792ac3 (patch)
treeddc86814ee8f35466e619bb63b8f15b41185074e /sys/netinet/siftr.c
parentb040c9742c99e20eb9926995bea03ad4f3e849c8 (diff)
downloadFreeBSD-src-fb307d7d1de2e083e767df27714dca5352792ac3.zip
FreeBSD-src-fb307d7d1de2e083e767df27714dca5352792ac3.tar.gz
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.
Diffstat (limited to 'sys/netinet/siftr.c')
-rw-r--r--sys/netinet/siftr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c
index 79af9dc..b5db118 100644
--- a/sys/netinet/siftr.c
+++ b/sys/netinet/siftr.c
@@ -260,7 +260,7 @@ struct siftr_stats
uint32_t nskip_out_dejavu;
};
-STATIC_DPCPU_DEFINE(struct siftr_stats, ss);
+static DPCPU_DEFINE(struct siftr_stats, ss);
static volatile unsigned int siftr_exit_pkt_manager_thread = 0;
static unsigned int siftr_enabled = 0;
OpenPOWER on IntegriCloud