Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Thomas Gleixner:
"Two patches addressing build warnings caused by inconsistent kernel
doc comments"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/wait: Clean up some documentation warnings
sched/core: Fix some documentation build warnings

Changed files
+5 -5
include
linux
kernel
sched
+4 -4
include/linux/wait.h
··· 529 529 530 530 /** 531 531 * wait_event_interruptible_hrtimeout - sleep until a condition gets true or a timeout elapses 532 - * @wq_head: the waitqueue to wait on 532 + * @wq: the waitqueue to wait on 533 533 * @condition: a C expression for the event to wait for 534 534 * @timeout: timeout, as a ktime_t 535 535 * 536 536 * The process is put to sleep (TASK_INTERRUPTIBLE) until the 537 537 * @condition evaluates to true or a signal is received. 538 - * The @condition is checked each time the waitqueue @wq_head is woken up. 538 + * The @condition is checked each time the waitqueue @wq is woken up. 539 539 * 540 540 * wake_up() has to be called after changing any variable that could 541 541 * change the result of the wait condition. ··· 735 735 736 736 /** 737 737 * wait_event_killable - sleep until a condition gets true 738 - * @wq: the waitqueue to wait on 738 + * @wq_head: the waitqueue to wait on 739 739 * @condition: a C expression for the event to wait for 740 740 * 741 741 * The process is put to sleep (TASK_KILLABLE) until the 742 742 * @condition evaluates to true or a signal is received. 743 - * The @condition is checked each time the waitqueue @wq is woken up. 743 + * The @condition is checked each time the waitqueue @wq_head is woken up. 744 744 * 745 745 * wake_up() has to be called after changing any variable that could 746 746 * change the result of the wait condition.
+1 -1
kernel/sched/core.c
··· 2069 2069 /** 2070 2070 * try_to_wake_up_local - try to wake up a local task with rq lock held 2071 2071 * @p: the thread to be awakened 2072 - * @cookie: context's cookie for pinning 2072 + * @rf: request-queue flags for pinning 2073 2073 * 2074 2074 * Put @p on the run-queue if it's not already there. The caller must 2075 2075 * ensure that this_rq() is locked, @p is bound to this_rq() and not