diff options
| author | dim <dim@FreeBSD.org> | 2010-11-14 20:23:02 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-11-14 20:23:02 +0000 |
| commit | 7dff36caf76f0b4c09712e32d78cf6ee8f2132c1 (patch) | |
| tree | facb20a04756e19b653bcb1e38f135b0e153eab6 | |
| parent | 756e9f53779b25e86ec78fa8ea80b869110fb7e5 (diff) | |
| download | FreeBSD-src-7dff36caf76f0b4c09712e32d78cf6ee8f2132c1.zip FreeBSD-src-7dff36caf76f0b4c09712e32d78cf6ee8f2132c1.tar.gz | |
Add macros to define static instances of VNET_DEFINE and DPCPU_DEFINE.
| -rw-r--r-- | sys/net/vnet.h | 15 | ||||
| -rw-r--r-- | sys/sys/pcpu.h | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sys/net/vnet.h b/sys/net/vnet.h index 76123c7..1453194 100644 --- a/sys/net/vnet.h +++ b/sys/net/vnet.h @@ -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. diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h index ad1cf33..d18a150 100644 --- a/sys/sys/pcpu.h +++ b/sys/sys/pcpu.h @@ -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. |
