summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2006-01-08 01:00:33 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:12:39 -0800
commitf9f7500521b25dbf1aba476b81230489ad8e2c4b (patch)
treef2bf2f64023c4968ac8d08da54b8aaef86354591 /net
parentb792de39d892e06b18ddea85be076bae123d6bf6 (diff)
downloadlinux-f9f7500521b25dbf1aba476b81230489ad8e2c4b.tar.gz
linux-f9f7500521b25dbf1aba476b81230489ad8e2c4b.tar.bz2
linux-f9f7500521b25dbf1aba476b81230489ad8e2c4b.zip
[PATCH] slab: remove unused align parameter from alloc_percpu
__alloc_percpu and alloc_percpu both take an 'align' argument which is completely ignored. snmp6_mib_init() in net/ipv6/af_inet6.c attempts to use it, but it will be ignored. Therefore, remove the 'align' argument and fixup the lone caller. Signed-off-by: Matthew Dobson <colpatch@us.ibm.com> Acked-by: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/af_inet6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 68afc53be662..25c3fe5005d9 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -689,11 +689,11 @@ snmp6_mib_init(void *ptr[2], size_t mibsize, size_t mibalign)
if (ptr == NULL)
return -EINVAL;
- ptr[0] = __alloc_percpu(mibsize, mibalign);
+ ptr[0] = __alloc_percpu(mibsize);
if (!ptr[0])
goto err0;
- ptr[1] = __alloc_percpu(mibsize, mibalign);
+ ptr[1] = __alloc_percpu(mibsize);
if (!ptr[1])
goto err1;