|
@@ -5564,10 +5564,10 @@ asmlinkage void __sched preempt_schedule_irq(void)
|
|
|
|
|
|
#endif /* CONFIG_PREEMPT */
|
|
|
|
|
|
-int default_wake_function(wait_queue_t *curr, unsigned mode, int flags,
|
|
|
+int default_wake_function(wait_queue_t *curr, unsigned mode, int wake_flags,
|
|
|
void *key)
|
|
|
{
|
|
|
- return try_to_wake_up(curr->private, mode, flags);
|
|
|
+ return try_to_wake_up(curr->private, mode, wake_flags);
|
|
|
}
|
|
|
EXPORT_SYMBOL(default_wake_function);
|
|
|
|
|
@@ -5581,14 +5581,14 @@ EXPORT_SYMBOL(default_wake_function);
|
|
|
* zero in this (rare) case, and we handle it by continuing to scan the queue.
|
|
|
*/
|
|
|
static void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
|
|
|
- int nr_exclusive, int flags, void *key)
|
|
|
+ int nr_exclusive, int wake_flags, void *key)
|
|
|
{
|
|
|
wait_queue_t *curr, *next;
|
|
|
|
|
|
list_for_each_entry_safe(curr, next, &q->task_list, task_list) {
|
|
|
unsigned flags = curr->flags;
|
|
|
|
|
|
- if (curr->func(curr, mode, flags, key) &&
|
|
|
+ if (curr->func(curr, mode, wake_flags, key) &&
|
|
|
(flags & WQ_FLAG_EXCLUSIVE) && !--nr_exclusive)
|
|
|
break;
|
|
|
}
|