alloc_percpu: add align argument to __alloc_percpu.

This prepares for a real __alloc_percpu, by adding an alignment argument.
Only one place uses __alloc_percpu directly, and that's for a string.

tj: af_inet also uses __alloc_percpu(), update it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Jens Axboe <axboe@kernel.dk>

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index c80cfe1260e..1fdaee93c04 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -108,9 +108,10 @@ static inline void percpu_free(void *__pdata)
 
 /* (legacy) interface for use without CPU hotplug handling */
 
-#define __alloc_percpu(size)    percpu_alloc_mask((size), GFP_KERNEL, \
+#define __alloc_percpu(size, align)     percpu_alloc_mask((size), GFP_KERNEL, \
                                                   cpu_possible_map)
-#define alloc_percpu(type)      (type *)__alloc_percpu(sizeof(type))
+#define alloc_percpu(type)      (type *)__alloc_percpu(sizeof(type), \
+                                                       __alignof__(type))
 #define free_percpu(ptr)        percpu_free((ptr))
 /*
  * Use this to get to a cpu's version of the per-cpu object dynamically