diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /kernel/wait.c | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'kernel/wait.c')
| -rw-r--r-- | kernel/wait.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index c4bd3d825f35..b0310eb6cc1e 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
| @@ -92,7 +92,7 @@ prepare_to_wait_exclusive(wait_queue_head_t *q, wait_queue_t *wait, int state) | |||
| 92 | } | 92 | } |
| 93 | EXPORT_SYMBOL(prepare_to_wait_exclusive); | 93 | EXPORT_SYMBOL(prepare_to_wait_exclusive); |
| 94 | 94 | ||
| 95 | /* | 95 | /** |
| 96 | * finish_wait - clean up after waiting in a queue | 96 | * finish_wait - clean up after waiting in a queue |
| 97 | * @q: waitqueue waited on | 97 | * @q: waitqueue waited on |
| 98 | * @wait: wait descriptor | 98 | * @wait: wait descriptor |
| @@ -127,11 +127,11 @@ void finish_wait(wait_queue_head_t *q, wait_queue_t *wait) | |||
| 127 | } | 127 | } |
| 128 | EXPORT_SYMBOL(finish_wait); | 128 | EXPORT_SYMBOL(finish_wait); |
| 129 | 129 | ||
| 130 | /* | 130 | /** |
| 131 | * abort_exclusive_wait - abort exclusive waiting in a queue | 131 | * abort_exclusive_wait - abort exclusive waiting in a queue |
| 132 | * @q: waitqueue waited on | 132 | * @q: waitqueue waited on |
| 133 | * @wait: wait descriptor | 133 | * @wait: wait descriptor |
| 134 | * @state: runstate of the waiter to be woken | 134 | * @mode: runstate of the waiter to be woken |
| 135 | * @key: key to identify a wait bit queue or %NULL | 135 | * @key: key to identify a wait bit queue or %NULL |
| 136 | * | 136 | * |
| 137 | * Sets current thread back to running state and removes | 137 | * Sets current thread back to running state and removes |