diff options
| author | Tejun Heo <tj@kernel.org> | 2009-06-24 02:13:45 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-06-24 02:13:45 -0400 |
| commit | 204fba4aa303ea4a7bb726a539bf4a5b9e3203d0 (patch) | |
| tree | 899707e00035f1ec83077c16a7f559ecbcc36986 /net | |
| parent | fe87f94f341a4b4097285b46f003059b26eb59bf (diff) | |
percpu: cleanup percpu array definitions
Currently, the following three different ways to define percpu arrays
are in use.
1. DEFINE_PER_CPU(elem_type[array_len], array_name);
2. DEFINE_PER_CPU(elem_type, array_name[array_len]);
3. DEFINE_PER_CPU(elem_type, array_name)[array_len];
Unify to #1 which correctly separates the roles of the two parameters
and thus allows more flexibility in the way percpu variables are
defined.
[ Impact: cleanup ]
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: linux-mm@kvack.org
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/syncookies.c | 2 | ||||
| -rw-r--r-- | net/ipv6/syncookies.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index cd2b97f1b6e1..84d90f2799bb 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c | |||
| @@ -37,7 +37,7 @@ __initcall(init_syncookies); | |||
| 37 | #define COOKIEBITS 24 /* Upper bits store count */ | 37 | #define COOKIEBITS 24 /* Upper bits store count */ |
| 38 | #define COOKIEMASK (((__u32)1 << COOKIEBITS) - 1) | 38 | #define COOKIEMASK (((__u32)1 << COOKIEBITS) - 1) |
| 39 | 39 | ||
| 40 | static DEFINE_PER_CPU(__u32, cookie_scratch)[16 + 5 + SHA_WORKSPACE_WORDS]; | 40 | static DEFINE_PER_CPU(__u32 [16 + 5 + SHA_WORKSPACE_WORDS], cookie_scratch); |
| 41 | 41 | ||
| 42 | static u32 cookie_hash(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport, | 42 | static u32 cookie_hash(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport, |
| 43 | u32 count, int c) | 43 | u32 count, int c) |
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index 8c2513982b61..23d0d6db0461 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c | |||
| @@ -74,7 +74,7 @@ static inline struct sock *get_cookie_sock(struct sock *sk, struct sk_buff *skb, | |||
| 74 | return child; | 74 | return child; |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | static DEFINE_PER_CPU(__u32, cookie_scratch)[16 + 5 + SHA_WORKSPACE_WORDS]; | 77 | static DEFINE_PER_CPU(__u32 [16 + 5 + SHA_WORKSPACE_WORDS], cookie_scratch); |
| 78 | 78 | ||
| 79 | static u32 cookie_hash(struct in6_addr *saddr, struct in6_addr *daddr, | 79 | static u32 cookie_hash(struct in6_addr *saddr, struct in6_addr *daddr, |
| 80 | __be16 sport, __be16 dport, u32 count, int c) | 80 | __be16 sport, __be16 dport, u32 count, int c) |