diff options
| author | Sheng Yang <sheng@linux.intel.com> | 2009-10-22 07:19:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-23 07:51:45 -0400 |
| commit | 72f279b256d520e321a850880d094bc0bcbf45d6 (patch) | |
| tree | d2ab19bd515108b1426636ce61a11e3e39ffe1a2 | |
| parent | 964fe080d94db82a3268443e9b9ece4c60246414 (diff) | |
generic-ipi: Fix misleading smp_call_function*() description
After commit:8969a5ede0f9e17da4b943712429aef2c9bcd82b
"generic-ipi: remove kmalloc()", wait = 0 can be guaranteed.
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Nick Piggin <npiggin@suse.de>
LKML-Reference: <1256210374-25354-1-git-send-email-sheng@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | kernel/smp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/kernel/smp.c b/kernel/smp.c index c9d1c7835c2f..8bd618f0364d 100644 --- a/kernel/smp.c +++ b/kernel/smp.c | |||
| @@ -265,9 +265,7 @@ static DEFINE_PER_CPU(struct call_single_data, csd_data); | |||
| 265 | * @info: An arbitrary pointer to pass to the function. | 265 | * @info: An arbitrary pointer to pass to the function. |
| 266 | * @wait: If true, wait until function has completed on other CPUs. | 266 | * @wait: If true, wait until function has completed on other CPUs. |
| 267 | * | 267 | * |
| 268 | * Returns 0 on success, else a negative status code. Note that @wait | 268 | * Returns 0 on success, else a negative status code. |
| 269 | * will be implicitly turned on in case of allocation failures, since | ||
| 270 | * we fall back to on-stack allocation. | ||
| 271 | */ | 269 | */ |
| 272 | int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | 270 | int smp_call_function_single(int cpu, void (*func) (void *info), void *info, |
| 273 | int wait) | 271 | int wait) |
| @@ -355,9 +353,7 @@ void __smp_call_function_single(int cpu, struct call_single_data *data, | |||
| 355 | * @wait: If true, wait (atomically) until function has completed | 353 | * @wait: If true, wait (atomically) until function has completed |
| 356 | * on other CPUs. | 354 | * on other CPUs. |
| 357 | * | 355 | * |
| 358 | * If @wait is true, then returns once @func has returned. Note that @wait | 356 | * If @wait is true, then returns once @func has returned. |
| 359 | * will be implicitly turned on in case of allocation failures, since | ||
| 360 | * we fall back to on-stack allocation. | ||
| 361 | * | 357 | * |
| 362 | * You must not call this function with disabled interrupts or from a | 358 | * You must not call this function with disabled interrupts or from a |
| 363 | * hardware interrupt handler or from a bottom half handler. Preemption | 359 | * hardware interrupt handler or from a bottom half handler. Preemption |
| @@ -443,8 +439,7 @@ EXPORT_SYMBOL(smp_call_function_many); | |||
| 443 | * Returns 0. | 439 | * Returns 0. |
| 444 | * | 440 | * |
| 445 | * If @wait is true, then returns once @func has returned; otherwise | 441 | * If @wait is true, then returns once @func has returned; otherwise |
| 446 | * it returns just before the target cpu calls @func. In case of allocation | 442 | * it returns just before the target cpu calls @func. |
| 447 | * failure, @wait will be implicitly turned on. | ||
| 448 | * | 443 | * |
| 449 | * You must not call this function with disabled interrupts or from a | 444 | * You must not call this function with disabled interrupts or from a |
| 450 | * hardware interrupt handler or from a bottom half handler. | 445 | * hardware interrupt handler or from a bottom half handler. |