From: Martin Peschke Correct a couple of inconsistencies regarding percpu_*() function prototypes (type and name of parameters), which didn't cause any harm, though. Signed-off-by: Martin Peschke Acked-by: Paul Jackson Signed-off-by: Andrew Morton --- include/linux/percpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN include/linux/percpu.h~cpu-hotplug-compatible-alloc_percpu-fix include/linux/percpu.h --- a/include/linux/percpu.h~cpu-hotplug-compatible-alloc_percpu-fix +++ a/include/linux/percpu.h @@ -47,7 +47,7 @@ extern void percpu_depopulate(void *__pd extern int percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp, cpumask_t mask); extern void percpu_depopulate_mask(void *__pdata, cpumask_t mask); -extern void *percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t map); +extern void *percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t mask); extern void percpu_free(void *__pdata); #else /* CONFIG_SMP */ @@ -69,12 +69,12 @@ static inline void *percpu_populate(void } static inline int percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp, - int cpu) + cpumask_t mask) { return 0; } -static inline void *percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t map) +static inline void *percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t mask) { return kzalloc(size, gfp); } _