mm/allocpercpu.c: make 4 functions static
Subsystems (2)
PATCH 1/1 mm/allocpercpu.c: make 4 functions static
This patch makes the following needlessly global functions static:
- percpu_depopulate()
- __percpu_depopulate_mask()
- percpu_populate()
- __percpu_populate_mask()
Signed-off-by Adrian Bunk <[email protected]>
---
include/linux/percpu.h | 29 ----------------------------- mm/allocpercpu.c | 20 +++++++++++--------- 2 files changed, 11 insertions(+), 38 deletions(-)
d11f49caeadfdeef1b9e9c07103de2cdb5346e36 diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 1ac9697..4437b52 100644
include/linux/percpu.h +0 -29
@@ -69,11 +69,6 @@ struct percpu_data { (__typeof__ (ptr ))__p->ptrs[(cpu)]; \ }) -extern void *percpu_populate (void *__pdata,size_t size,gfp_t gfp,int cpu); -extern void percpu_depopulate (void *__pdata,int cpu); -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 *mask);extern void percpu_free (void *__pdata);
@@ -81,26 +76,6 @@ extern void percpu_free(void *__pdata);#define percpu_ptr (ptr, cpu) ({ (void)(cpu); (ptr); }) -static inline void percpu_depopulate (void *__pdata,int cpu) -{ -} - -static inline void __percpu_depopulate_mask (void *__pdata,cpumask_t *mask) -{ -} - -static inline void *percpu_populate (void *__pdata,size_t size,gfp_t gfp, -int cpu) -{ -return percpu_ptr (__pdata, cpu); -} - -static inline int __percpu_populate_mask (void *__pdata,size_t size,gfp_t gfp, -cpumask_t *mask) -{ -return 0 ; -} - static __always_inline void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask) {return kzalloc (size, gfp);
@@ -113,10 +88,6 @@ static inline void percpu_free(void *__pdata)#endif /* CONFIG_SMP */ -#define percpu_populate_mask (__pdata, size, gfp, mask) \ - __percpu_populate_mask((__pdata), (size), (gfp), &(mask)) -#define percpu_depopulate_mask (__pdata, mask) \ - __percpu_depopulate_mask((__pdata), &(mask))#define percpu_alloc_mask (size, gfp, mask) \ __percpu_alloc_mask((size), (gfp), &(mask))
mm/allocpercpu.c +11 -9
@@ -14,27 +14,28 @@* Depopulating per-cpu data for a cpu going offline would be a typical * use case. You need to register a cpu hotplug handler for that purpose. */ -void percpu_depopulate (void *__pdata,int cpu) +static void percpu_depopulate (void *__pdata,int cpu) {struct percpu_data *pdata =__percpu_disguise (__pdata);kfree (pdata->ptrs[cpu]); pdata->ptrs[cpu] =NULL ; } -EXPORT_SYMBOL_GPL (percpu_depopulate);/** * percpu_depopulate_mask - depopulate per-cpu data for some cpu's * @__pdata: per-cpu data to depopulate * @mask: depopulate per-cpu data for cpu's selected through mask bits */ -void __percpu_depopulate_mask (void *__pdata,cpumask_t *mask) +static void __percpu_depopulate_mask (void *__pdata,cpumask_t *mask) {int cpu;for_each_cpu_mask (cpu, *mask)percpu_depopulate (__pdata, cpu); } -EXPORT_SYMBOL_GPL (__percpu_depopulate_mask); + +#define percpu_depopulate_mask (__pdata, mask) \ + __percpu_depopulate_mask((__pdata), &(mask))/** * percpu_populate - populate per-cpu data for given cpu
@@ -47,7 +48,7 @@ EXPORT_SYMBOL_GPL(__percpu_depopulate_mask);* use case. You need to register a cpu hotplug handler for that purpose. * Per-cpu object is populated with zeroed buffer. */ -void *percpu_populate (void *__pdata,size_t size,gfp_t gfp,int cpu) +static void *percpu_populate (void *__pdata,size_t size,gfp_t gfp,int cpu) {struct percpu_data *pdata =__percpu_disguise (__pdata);int node =cpu_to_node (cpu);
@@ -59,7 +60,6 @@ void *percpu_populate(void *__pdata, size_t size, gfp_t gfp, int cpu) pdata->ptrs[cpu] =kzalloc (size, gfp);return pdata->ptrs[cpu]; } -EXPORT_SYMBOL_GPL (percpu_populate);/** * percpu_populate_mask - populate per-cpu data for more cpu's
@@ -70,8 +70,8 @@ EXPORT_SYMBOL_GPL(percpu_populate);* * Per-cpu objects are populated with zeroed buffers. */ -int __percpu_populate_mask (void *__pdata,size_t size,gfp_t gfp, -cpumask_t *mask) +static int __percpu_populate_mask (void *__pdata,size_t size,gfp_t gfp, +cpumask_t *mask) {cpumask_t populated =CPU_MASK_NONE ;int cpu;
@@ -84,7 +84,9 @@ int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,cpu_set (cpu, populated);return 0 ; } -EXPORT_SYMBOL_GPL (__percpu_populate_mask); + +#define percpu_populate_mask (__pdata, size, gfp, mask) \ + __percpu_populate_mask((__pdata), (size), (gfp), &(mask))/** * percpu_alloc_mask - initial setup of per-cpu data