diff --git a/[refs] b/[refs] index 6f7ad92ab331..8bd90d78c7f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb61c210835db95b0e9fb612a316422e7cc675e3 +refs/heads/master: 2e45874c5aabe573b6ab4328f303c765701394f9 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 2054e557d0d2..e92b185e371b 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -3634,10 +3634,9 @@ EXPORT_SYMBOL(default_wake_function); static void __wake_up_common(wait_queue_head_t *q, unsigned int mode, int nr_exclusive, int sync, void *key) { - struct list_head *tmp, *next; + wait_queue_t *curr, *next; - list_for_each_safe(tmp, next, &q->task_list) { - wait_queue_t *curr = list_entry(tmp, wait_queue_t, task_list); + list_for_each_entry_safe(curr, next, &q->task_list, task_list) { unsigned flags = curr->flags; if (curr->func(curr, mode, sync, key) &&