diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 2 | ||||
-rw-r--r-- | kernel/wait.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 36d213bca473..92b4b56ad093 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -5345,7 +5345,7 @@ EXPORT_SYMBOL(default_wake_function); | |||
5345 | * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns | 5345 | * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns |
5346 | * zero in this (rare) case, and we handle it by continuing to scan the queue. | 5346 | * zero in this (rare) case, and we handle it by continuing to scan the queue. |
5347 | */ | 5347 | */ |
5348 | void __wake_up_common(wait_queue_head_t *q, unsigned int mode, | 5348 | static void __wake_up_common(wait_queue_head_t *q, unsigned int mode, |
5349 | int nr_exclusive, int sync, void *key) | 5349 | int nr_exclusive, int sync, void *key) |
5350 | { | 5350 | { |
5351 | wait_queue_t *curr, *next; | 5351 | wait_queue_t *curr, *next; |
diff --git a/kernel/wait.c b/kernel/wait.c index 42a2dbc181c8..ea7c3b4275cf 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
@@ -154,7 +154,7 @@ void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait, | |||
154 | if (!list_empty(&wait->task_list)) | 154 | if (!list_empty(&wait->task_list)) |
155 | list_del_init(&wait->task_list); | 155 | list_del_init(&wait->task_list); |
156 | else if (waitqueue_active(q)) | 156 | else if (waitqueue_active(q)) |
157 | __wake_up_common(q, mode, 1, 0, key); | 157 | __wake_up_locked_key(q, mode, key); |
158 | spin_unlock_irqrestore(&q->lock, flags); | 158 | spin_unlock_irqrestore(&q->lock, flags); |
159 | } | 159 | } |
160 | EXPORT_SYMBOL(abort_exclusive_wait); | 160 | EXPORT_SYMBOL(abort_exclusive_wait); |