diff options
| author | dim <dim@FreeBSD.org> | 2010-11-22 19:32:54 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-11-22 19:32:54 +0000 |
| commit | fb307d7d1de2e083e767df27714dca5352792ac3 (patch) | |
| tree | ddc86814ee8f35466e619bb63b8f15b41185074e /sys/netipsec/keysock.c | |
| parent | b040c9742c99e20eb9926995bea03ad4f3e849c8 (diff) | |
| download | FreeBSD-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/netipsec/keysock.c')
| -rw-r--r-- | sys/netipsec/keysock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 2fb1c1f..143b600 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -70,7 +70,7 @@ struct key_cb { int key_count; int any_count; }; -STATIC_VNET_DEFINE(struct key_cb, key_cb); +static VNET_DEFINE(struct key_cb, key_cb); #define V_key_cb VNET(key_cb) static struct sockaddr key_src = { 2, PF_KEY, }; |
