diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-03-18 20:36:06 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-21 18:34:16 -0700 |
| commit | ec733b15a3ef0b5759141a177f8044a2f40c41e7 (patch) | |
| tree | 41af80ea4dcc89cc049bd36cbd882916a6469263 /net | |
| parent | 62c97ac04a67c120ec37a9bfd445a8d5dbbc1ed2 (diff) | |
| download | op-kernel-dev-ec733b15a3ef0b5759141a177f8044a2f40c41e7.zip op-kernel-dev-ec733b15a3ef0b5759141a177f8044a2f40c41e7.tar.gz | |
net: snmp mib cleanup
There is no point to align or pad mibs to cache lines, they are per cpu
allocated with a 8 bytes alignment anyway.
This wastes space for no gain. This patch removes __SNMP_MIB_ALIGN__
Since SNMP mibs contain "unsigned long" fields only, we can relax the
allocation alignment from "unsigned long long" to "unsigned long"
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dccp/dccp.h | 2 | ||||
| -rw-r--r-- | net/ipv4/af_inet.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 5ef32c2..53f8e12 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h @@ -189,7 +189,7 @@ enum { #define DCCP_MIB_MAX __DCCP_MIB_MAX struct dccp_mib { unsigned long mibs[DCCP_MIB_MAX]; -} __SNMP_MIB_ALIGN__; +}; DECLARE_SNMP_STAT(struct dccp_mib, dccp_statistics); #define DCCP_INC_STATS(field) SNMP_INC_STATS(dccp_statistics, field) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 33b7dff..55e1190 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1401,10 +1401,10 @@ EXPORT_SYMBOL_GPL(snmp_fold_field); int snmp_mib_init(void __percpu *ptr[2], size_t mibsize) { BUG_ON(ptr == NULL); - ptr[0] = __alloc_percpu(mibsize, __alignof__(unsigned long long)); + ptr[0] = __alloc_percpu(mibsize, __alignof__(unsigned long)); if (!ptr[0]) goto err0; - ptr[1] = __alloc_percpu(mibsize, __alignof__(unsigned long long)); + ptr[1] = __alloc_percpu(mibsize, __alignof__(unsigned long)); if (!ptr[1]) goto err1; return 0; |
