From: Pekka Enberg __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 Acked-by: Manfred Spraul Signed-off-by: Andrew Morton --- include/linux/percpu.h | 7 +++---- mm/slab.c | 3 +-- net/ipv6/af_inet6.c | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff -puN include/linux/percpu.h~slab-remove-unused-align-parameter-from-alloc_percpu include/linux/percpu.h --- devel/include/linux/percpu.h~slab-remove-unused-align-parameter-from-alloc_percpu 2005-12-22 05:08:48.000000000 -0800 +++ devel-akpm/include/linux/percpu.h 2005-12-22 05:08:48.000000000 -0800 @@ -33,14 +33,14 @@ struct percpu_data { (__typeof__(ptr))__p->ptrs[(cpu)]; \ }) -extern void *__alloc_percpu(size_t size, size_t align); +extern void *__alloc_percpu(size_t size); extern void free_percpu(const void *); #else /* CONFIG_SMP */ #define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); }) -static inline void *__alloc_percpu(size_t size, size_t align) +static inline void *__alloc_percpu(size_t size) { void *ret = kmalloc(size, GFP_KERNEL); if (ret) @@ -55,7 +55,6 @@ static inline void free_percpu(const voi #endif /* CONFIG_SMP */ /* Simple wrapper for the common case: zeros memory. */ -#define alloc_percpu(type) \ - ((type *)(__alloc_percpu(sizeof(type), __alignof__(type)))) +#define alloc_percpu(type) ((type *)(__alloc_percpu(sizeof(type)))) #endif /* __LINUX_PERCPU_H */ diff -puN mm/slab.c~slab-remove-unused-align-parameter-from-alloc_percpu mm/slab.c --- devel/mm/slab.c~slab-remove-unused-align-parameter-from-alloc_percpu 2005-12-22 05:08:48.000000000 -0800 +++ devel-akpm/mm/slab.c 2005-12-22 05:08:48.000000000 -0800 @@ -2961,9 +2961,8 @@ EXPORT_SYMBOL(__kmalloc); * Objects should be dereferenced using the per_cpu_ptr macro only. * * @size: how many bytes of memory are required. - * @align: the alignment, which can't be greater than SMP_CACHE_BYTES. */ -void *__alloc_percpu(size_t size, size_t align) +void *__alloc_percpu(size_t size) { int i; struct percpu_data *pdata = kmalloc(sizeof (*pdata), GFP_KERNEL); diff -puN net/ipv6/af_inet6.c~slab-remove-unused-align-parameter-from-alloc_percpu net/ipv6/af_inet6.c --- devel/net/ipv6/af_inet6.c~slab-remove-unused-align-parameter-from-alloc_percpu 2005-12-22 05:08:48.000000000 -0800 +++ devel-akpm/net/ipv6/af_inet6.c 2005-12-22 05:08:48.000000000 -0800 @@ -691,11 +691,11 @@ snmp6_mib_init(void *ptr[2], size_t mibs 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; _