Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9d8fddfb17aaee4ffc5e3d0560620d0fa8b50a42

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent 9e5c6da71e
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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 <bunk@kernel.org>
Acked-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 11 additions and 38 deletions Side-by-side Diff

include/linux/percpu.h
Diff comments   View file @ 9d8fddf
... ... @@ -74,11 +74,6 @@
74 74 (__typeof__(ptr))__p->ptrs[(cpu)]; \
75 75 })
76 76  
77   -extern void *percpu_populate(void *__pdata, size_t size, gfp_t gfp, int cpu);
78   -extern void percpu_depopulate(void *__pdata, int cpu);
79   -extern int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
80   - cpumask_t *mask);
81   -extern void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask);
82 77 extern void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask);
83 78 extern void percpu_free(void *__pdata);
84 79  
... ... @@ -86,26 +81,6 @@
86 81  
87 82 #define percpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); })
88 83  
89   -static inline void percpu_depopulate(void *__pdata, int cpu)
90   -{
91   -}
92   -
93   -static inline void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask)
94   -{
95   -}
96   -
97   -static inline void *percpu_populate(void *__pdata, size_t size, gfp_t gfp,
98   - int cpu)
99   -{
100   - return percpu_ptr(__pdata, cpu);
101   -}
102   -
103   -static inline int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
104   - cpumask_t *mask)
105   -{
106   - return 0;
107   -}
108   -
109 84 static __always_inline void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask)
110 85 {
111 86 return kzalloc(size, gfp);
... ... @@ -118,10 +93,6 @@
118 93  
119 94 #endif /* CONFIG_SMP */
120 95  
121   -#define percpu_populate_mask(__pdata, size, gfp, mask) \
122   - __percpu_populate_mask((__pdata), (size), (gfp), &(mask))
123   -#define percpu_depopulate_mask(__pdata, mask) \
124   - __percpu_depopulate_mask((__pdata), &(mask))
125 96 #define percpu_alloc_mask(size, gfp, mask) \
126 97 __percpu_alloc_mask((size), (gfp), &(mask))
127 98  
... ... @@ -18,28 +18,29 @@
18 18 * Depopulating per-cpu data for a cpu going offline would be a typical
19 19 * use case. You need to register a cpu hotplug handler for that purpose.
20 20 */
21   -void percpu_depopulate(void *__pdata, int cpu)
  21 +static void percpu_depopulate(void *__pdata, int cpu)
22 22 {
23 23 struct percpu_data *pdata = __percpu_disguise(__pdata);
24 24  
25 25 kfree(pdata->ptrs[cpu]);
26 26 pdata->ptrs[cpu] = NULL;
27 27 }
28   -EXPORT_SYMBOL_GPL(percpu_depopulate);
29 28  
30 29 /**
31 30 * percpu_depopulate_mask - depopulate per-cpu data for some cpu's
32 31 * @__pdata: per-cpu data to depopulate
33 32 * @mask: depopulate per-cpu data for cpu's selected through mask bits
34 33 */
35   -void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask)
  34 +static void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask)
36 35 {
37 36 int cpu;
38 37 for_each_cpu_mask_nr(cpu, *mask)
39 38 percpu_depopulate(__pdata, cpu);
40 39 }
41   -EXPORT_SYMBOL_GPL(__percpu_depopulate_mask);
42 40  
  41 +#define percpu_depopulate_mask(__pdata, mask) \
  42 + __percpu_depopulate_mask((__pdata), &(mask))
  43 +
43 44 /**
44 45 * percpu_populate - populate per-cpu data for given cpu
45 46 * @__pdata: per-cpu data to populate further
... ... @@ -51,7 +52,7 @@
51 52 * use case. You need to register a cpu hotplug handler for that purpose.
52 53 * Per-cpu object is populated with zeroed buffer.
53 54 */
54   -void *percpu_populate(void *__pdata, size_t size, gfp_t gfp, int cpu)
  55 +static void *percpu_populate(void *__pdata, size_t size, gfp_t gfp, int cpu)
55 56 {
56 57 struct percpu_data *pdata = __percpu_disguise(__pdata);
57 58 int node = cpu_to_node(cpu);
... ... @@ -68,7 +69,6 @@
68 69 pdata->ptrs[cpu] = kzalloc(size, gfp);
69 70 return pdata->ptrs[cpu];
70 71 }
71   -EXPORT_SYMBOL_GPL(percpu_populate);
72 72  
73 73 /**
74 74 * percpu_populate_mask - populate per-cpu data for more cpu's
... ... @@ -79,8 +79,8 @@
79 79 *
80 80 * Per-cpu objects are populated with zeroed buffers.
81 81 */
82   -int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
83   - cpumask_t *mask)
  82 +static int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
  83 + cpumask_t *mask)
84 84 {
85 85 cpumask_t populated;
86 86 int cpu;
... ... @@ -94,7 +94,9 @@
94 94 cpu_set(cpu, populated);
95 95 return 0;
96 96 }
97   -EXPORT_SYMBOL_GPL(__percpu_populate_mask);
  97 +
  98 +#define percpu_populate_mask(__pdata, size, gfp, mask) \
  99 + __percpu_populate_mask((__pdata), (size), (gfp), &(mask))
98 100  
99 101 /**
100 102 * percpu_alloc_mask - initial setup of per-cpu data