diff options
author | Olof Johansson <olof@lixom.net> | 2007-12-27 23:08:36 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-25 06:52:49 -0500 |
commit | b616de5ef928ac1914348ff6a42521ca6b83112e (patch) | |
tree | a57b5238509272287792807da2ede6992f3f7186 | |
parent | dcb571be2019ae677bc5ed64437dbc87ae1eb67f (diff) |
[POWERPC] Make smp_call_function_map static
smp_call_function_map should be static, and for consistency prepend it
with __ like other local helper functions in the same file.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/smp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 338950aeb6f6..cefeee81c52e 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
@@ -181,12 +181,13 @@ static struct call_data_struct { | |||
181 | * <wait> If true, wait (atomically) until function has completed on other CPUs. | 181 | * <wait> If true, wait (atomically) until function has completed on other CPUs. |
182 | * [RETURNS] 0 on success, else a negative status code. Does not return until | 182 | * [RETURNS] 0 on success, else a negative status code. Does not return until |
183 | * remote CPUs are nearly ready to execute <<func>> or are or have executed. | 183 | * remote CPUs are nearly ready to execute <<func>> or are or have executed. |
184 | * <map> is a cpu map of the cpus to send IPI to. | ||
184 | * | 185 | * |
185 | * You must not call this function with disabled interrupts or from a | 186 | * You must not call this function with disabled interrupts or from a |
186 | * hardware interrupt handler or from a bottom half handler. | 187 | * hardware interrupt handler or from a bottom half handler. |
187 | */ | 188 | */ |
188 | int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic, | 189 | static int __smp_call_function_map(void (*func) (void *info), void *info, |
189 | int wait, cpumask_t map) | 190 | int nonatomic, int wait, cpumask_t map) |
190 | { | 191 | { |
191 | struct call_data_struct data; | 192 | struct call_data_struct data; |
192 | int ret = -1, num_cpus; | 193 | int ret = -1, num_cpus; |
@@ -265,7 +266,8 @@ int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic, | |||
265 | static int __smp_call_function(void (*func)(void *info), void *info, | 266 | static int __smp_call_function(void (*func)(void *info), void *info, |
266 | int nonatomic, int wait) | 267 | int nonatomic, int wait) |
267 | { | 268 | { |
268 | return smp_call_function_map(func,info,nonatomic,wait,cpu_online_map); | 269 | return __smp_call_function_map(func, info, nonatomic, wait, |
270 | cpu_online_map); | ||
269 | } | 271 | } |
270 | 272 | ||
271 | int smp_call_function(void (*func) (void *info), void *info, int nonatomic, | 273 | int smp_call_function(void (*func) (void *info), void *info, int nonatomic, |
@@ -278,8 +280,8 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic, | |||
278 | } | 280 | } |
279 | EXPORT_SYMBOL(smp_call_function); | 281 | EXPORT_SYMBOL(smp_call_function); |
280 | 282 | ||
281 | int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int nonatomic, | 283 | int smp_call_function_single(int cpu, void (*func) (void *info), void *info, |
282 | int wait) | 284 | int nonatomic, int wait) |
283 | { | 285 | { |
284 | cpumask_t map = CPU_MASK_NONE; | 286 | cpumask_t map = CPU_MASK_NONE; |
285 | int ret = 0; | 287 | int ret = 0; |
@@ -292,7 +294,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int | |||
292 | 294 | ||
293 | cpu_set(cpu, map); | 295 | cpu_set(cpu, map); |
294 | if (cpu != get_cpu()) | 296 | if (cpu != get_cpu()) |
295 | ret = smp_call_function_map(func,info,nonatomic,wait,map); | 297 | ret = __smp_call_function_map(func, info, nonatomic, wait, map); |
296 | else { | 298 | else { |
297 | local_irq_disable(); | 299 | local_irq_disable(); |
298 | func(info); | 300 | func(info); |