Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9f75005 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[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: default avatarMatthew Dobson <colpatch@us.ibm.com>
Acked-by: default avatarManfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b792de39

include/linux/percpu.h

+3 −4
Original line number Diff line number Diff line
@@ -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 void *ptr) 
#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 */

mm/slab.c

+1 −2
Original line number Diff line number Diff line
@@ -2944,9 +2944,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);

net/ipv6/af_inet6.c

+2 −2
Original line number Diff line number Diff line
@@ -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;