diff options
| author |   Martin Josefsson <gandalf@wlug.westbo.se> | 2006-11-29 02:35:04 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:31:08 -0800 |
| commit | e2b7606cdb602a4f69c02cfc8bebe9c63b595e24 (patch) | |
| tree | ca56dcbad9b5d3ca8b1f5626e6587b5aa3d168e4 /net | |
| parent | [NETFILTER]: nf_conntrack: split out protocol handling (diff) | |
| download | linux-dev-e2b7606cdb602a4f69c02cfc8bebe9c63b595e24.tar.xz linux-dev-e2b7606cdb602a4f69c02cfc8bebe9c63b595e24.zip | |
[NETFILTER]: More __read_mostly annotations
Place rarely written variables in the read-mostly section by using
__read_mostly
Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/core.c | 4 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 4 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_helper.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 17f9e1cbc73b..291b8c6862f1 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -28,7 +28,7 @@ static DEFINE_SPINLOCK(afinfo_lock); -struct nf_afinfo *nf_afinfo[NPROTO]; +struct nf_afinfo *nf_afinfo[NPROTO] __read_mostly; EXPORT_SYMBOL(nf_afinfo); int nf_register_afinfo(struct nf_afinfo *afinfo) @@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(nf_unregister_afinfo); * of skbuffs queued for userspace, and not deregister a hook unless * this is zero, but that sucks. Now, we simply check when the * packets come back: if the hook is gone, the packet is discarded. */ -struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS]; +struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS] __read_mostly; EXPORT_SYMBOL(nf_hooks); static DEFINE_SPINLOCK(nf_hook_lock); diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 09c0e6311044..6607ed415861 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -73,10 +73,10 @@ DEFINE_RWLOCK(nf_conntrack_lock); atomic_t nf_conntrack_count = ATOMIC_INIT(0); void (*nf_conntrack_destroyed)(struct nf_conn *conntrack) = NULL; -unsigned int nf_conntrack_htable_size __read_mostly = 0; +unsigned int nf_conntrack_htable_size __read_mostly; int nf_conntrack_max __read_mostly; struct list_head *nf_conntrack_hash __read_mostly; -struct nf_conn nf_conntrack_untracked; +struct nf_conn nf_conntrack_untracked __read_mostly; unsigned int nf_ct_log_invalid __read_mostly; LIST_HEAD(unconfirmed); static int nf_conntrack_vmalloc __read_mostly; diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index ca044875a561..2af92204722b 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -30,7 +30,7 @@ #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_core.h> -static LIST_HEAD(helpers); +static __read_mostly LIST_HEAD(helpers); struct nf_conntrack_helper * __nf_ct_helper_find(const struct nf_conntrack_tuple *tuple) |