aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-06-06 05:18:06 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-06-26 05:24:35 -0400
commit8691e5a8f691cc2a4fda0651e8d307aaba0e7d68 (patch)
tree6cb6767064d2d43441212566da2d83dcc9a0cd8e /kernel
parent490f5de52a87063fcb40e3b22f61b0779603ff6d (diff)
smp_call_function: get rid of the unused nonatomic/retry argument
It's never used and the comments refer to nonatomic and retry interchangably. So get rid of it. Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/smp.c6
-rw-r--r--kernel/softirq.c2
-rw-r--r--kernel/time/tick-broadcast.c2
3 files changed, 4 insertions, 6 deletions
diff --git a/kernel/smp.c b/kernel/smp.c
index f77b75c027ad..7e0432a4a0e2 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -195,7 +195,6 @@ void generic_smp_call_function_single_interrupt(void)
195 * smp_call_function_single - Run a function on a specific CPU 195 * smp_call_function_single - Run a function on a specific CPU
196 * @func: The function to run. This must be fast and non-blocking. 196 * @func: The function to run. This must be fast and non-blocking.
197 * @info: An arbitrary pointer to pass to the function. 197 * @info: An arbitrary pointer to pass to the function.
198 * @retry: Unused
199 * @wait: If true, wait until function has completed on other CPUs. 198 * @wait: If true, wait until function has completed on other CPUs.
200 * 199 *
201 * Returns 0 on success, else a negative status code. Note that @wait 200 * Returns 0 on success, else a negative status code. Note that @wait
@@ -203,7 +202,7 @@ void generic_smp_call_function_single_interrupt(void)
203 * we fall back to on-stack allocation. 202 * we fall back to on-stack allocation.
204 */ 203 */
205int smp_call_function_single(int cpu, void (*func) (void *info), void *info, 204int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
206 int retry, int wait) 205 int wait)
207{ 206{
208 struct call_single_data d; 207 struct call_single_data d;
209 unsigned long flags; 208 unsigned long flags;
@@ -339,7 +338,6 @@ EXPORT_SYMBOL(smp_call_function_mask);
339 * smp_call_function(): Run a function on all other CPUs. 338 * smp_call_function(): Run a function on all other CPUs.
340 * @func: The function to run. This must be fast and non-blocking. 339 * @func: The function to run. This must be fast and non-blocking.
341 * @info: An arbitrary pointer to pass to the function. 340 * @info: An arbitrary pointer to pass to the function.
342 * @natomic: Unused
343 * @wait: If true, wait (atomically) until function has completed on other CPUs. 341 * @wait: If true, wait (atomically) until function has completed on other CPUs.
344 * 342 *
345 * Returns 0 on success, else a negative status code. 343 * Returns 0 on success, else a negative status code.
@@ -351,7 +349,7 @@ EXPORT_SYMBOL(smp_call_function_mask);
351 * You must not call this function with disabled interrupts or from a 349 * You must not call this function with disabled interrupts or from a
352 * hardware interrupt handler or from a bottom half handler. 350 * hardware interrupt handler or from a bottom half handler.
353 */ 351 */
354int smp_call_function(void (*func)(void *), void *info, int natomic, int wait) 352int smp_call_function(void (*func)(void *), void *info, int wait)
355{ 353{
356 int ret; 354 int ret;
357 355
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 36e061740047..d73afb4764ef 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -679,7 +679,7 @@ int on_each_cpu(void (*func) (void *info), void *info, int retry, int wait)
679 int ret = 0; 679 int ret = 0;
680 680
681 preempt_disable(); 681 preempt_disable();
682 ret = smp_call_function(func, info, retry, wait); 682 ret = smp_call_function(func, info, wait);
683 local_irq_disable(); 683 local_irq_disable();
684 func(info); 684 func(info);
685 local_irq_enable(); 685 local_irq_enable();
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 57a1f02e5ec0..75e718539dcb 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -266,7 +266,7 @@ void tick_broadcast_on_off(unsigned long reason, int *oncpu)
266 "offline CPU #%d\n", *oncpu); 266 "offline CPU #%d\n", *oncpu);
267 else 267 else
268 smp_call_function_single(*oncpu, tick_do_broadcast_on_off, 268 smp_call_function_single(*oncpu, tick_do_broadcast_on_off,
269 &reason, 1, 1); 269 &reason, 1);
270} 270}
271 271
272/* 272/*