aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/smp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/kernel/smp.c')
-rw-r--r--arch/i386/kernel/smp.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index fe38b49a1223..9d84f6f001bf 100644
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -554,8 +554,10 @@ static void __smp_call_function(void (*func) (void *info), void *info,
554 * @info: An arbitrary pointer to pass to the function. 554 * @info: An arbitrary pointer to pass to the function.
555 * @wait: If true, wait (atomically) until function has completed on other CPUs. 555 * @wait: If true, wait (atomically) until function has completed on other CPUs.
556 * 556 *
557 * Returns 0 on success, else a negative status code. Does not return until 557 * Returns 0 on success, else a negative status code.
558 * remote CPUs are nearly ready to execute <<func>> or are or have finished. 558 *
559 * If @wait is true, then returns once @func has returned; otherwise
560 * it returns just before the target cpu calls @func.
559 * 561 *
560 * You must not call this function with disabled interrupts or from a 562 * You must not call this function with disabled interrupts or from a
561 * hardware interrupt handler or from a bottom half handler. 563 * hardware interrupt handler or from a bottom half handler.
@@ -617,11 +619,13 @@ int native_smp_call_function_mask(cpumask_t mask,
617 * smp_call_function(): Run a function on all other CPUs. 619 * smp_call_function(): Run a function on all other CPUs.
618 * @func: The function to run. This must be fast and non-blocking. 620 * @func: The function to run. This must be fast and non-blocking.
619 * @info: An arbitrary pointer to pass to the function. 621 * @info: An arbitrary pointer to pass to the function.
620 * @nonatomic: currently unused. 622 * @nonatomic: Unused.
621 * @wait: If true, wait (atomically) until function has completed on other CPUs. 623 * @wait: If true, wait (atomically) until function has completed on other CPUs.
622 * 624 *
623 * Returns 0 on success, else a negative status code. Does not return until 625 * Returns 0 on success, else a negative status code.
624 * remote CPUs are nearly ready to execute <<func>> or are or have executed. 626 *
627 * If @wait is true, then returns once @func has returned; otherwise
628 * it returns just before the target cpu calls @func.
625 * 629 *
626 * You must not call this function with disabled interrupts or from a 630 * You must not call this function with disabled interrupts or from a
627 * hardware interrupt handler or from a bottom half handler. 631 * hardware interrupt handler or from a bottom half handler.
@@ -633,17 +637,18 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
633} 637}
634EXPORT_SYMBOL(smp_call_function); 638EXPORT_SYMBOL(smp_call_function);
635 639
636/* 640/**
637 * smp_call_function_single - Run a function on another CPU 641 * smp_call_function_single - Run a function on another CPU
642 * @cpu: The target CPU. Cannot be the calling CPU.
638 * @func: The function to run. This must be fast and non-blocking. 643 * @func: The function to run. This must be fast and non-blocking.
639 * @info: An arbitrary pointer to pass to the function. 644 * @info: An arbitrary pointer to pass to the function.
640 * @nonatomic: Currently unused. 645 * @nonatomic: Unused.
641 * @wait: If true, wait until function has completed on other CPUs. 646 * @wait: If true, wait until function has completed on other CPUs.
642 * 647 *
643 * Retrurns 0 on success, else a negative status code. 648 * Returns 0 on success, else a negative status code.
644 * 649 *
645 * Does not return until the remote CPU is nearly ready to execute <func> 650 * If @wait is true, then returns once @func has returned; otherwise
646 * or is or has executed. 651 * it returns just before the target cpu calls @func.
647 */ 652 */
648int smp_call_function_single(int cpu, void (*func) (void *info), void *info, 653int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
649 int nonatomic, int wait) 654 int nonatomic, int wait)