p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2017-07-30 11:54:08 -07:00
parent dbc52a8030 6c423f5751
commit e4776b8ccb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/wait.h
View File

@ -529,13 +529,13 @@ do { \
/** /**
* wait_event_interruptible_hrtimeout - sleep until a condition gets true or a timeout elapses * wait_event_interruptible_hrtimeout - sleep until a condition gets true or a timeout elapses
* @wq_head: the waitqueue to wait on * @wq: the waitqueue to wait on
* @condition: a C expression for the event to wait for * @condition: a C expression for the event to wait for
* @timeout: timeout, as a ktime_t * @timeout: timeout, as a ktime_t
* *
* The process is put to sleep (TASK_INTERRUPTIBLE) until the * The process is put to sleep (TASK_INTERRUPTIBLE) until the
* @condition evaluates to true or a signal is received. * @condition evaluates to true or a signal is received.
* The @condition is checked each time the waitqueue @wq_head is woken up. * The @condition is checked each time the waitqueue @wq is woken up.
* *
* wake_up() has to be called after changing any variable that could * wake_up() has to be called after changing any variable that could
* change the result of the wait condition. * change the result of the wait condition.
@ -735,12 +735,12 @@ extern int do_wait_intr_irq(wait_queue_head_t *, wait_queue_entry_t *);
/** /**
* wait_event_killable - sleep until a condition gets true * wait_event_killable - sleep until a condition gets true
* @wq: the waitqueue to wait on * @wq_head: the waitqueue to wait on
* @condition: a C expression for the event to wait for * @condition: a C expression for the event to wait for
* *
* The process is put to sleep (TASK_KILLABLE) until the * The process is put to sleep (TASK_KILLABLE) until the
* @condition evaluates to true or a signal is received. * @condition evaluates to true or a signal is received.
* The @condition is checked each time the waitqueue @wq is woken up. * The @condition is checked each time the waitqueue @wq_head is woken up.
* *
* wake_up() has to be called after changing any variable that could * wake_up() has to be called after changing any variable that could
* change the result of the wait condition. * change the result of the wait condition.

2
kernel/sched/core.c
View File

@ -2069,7 +2069,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
/** /**
* try_to_wake_up_local - try to wake up a local task with rq lock held * try_to_wake_up_local - try to wake up a local task with rq lock held
* @p: the thread to be awakened * @p: the thread to be awakened
* @cookie: context's cookie for pinning * @rf: request-queue flags for pinning
* *
* Put @p on the run-queue if it's not already there. The caller must * Put @p on the run-queue if it's not already there. The caller must
* ensure that this_rq() is locked, @p is bound to this_rq() and not * ensure that this_rq() is locked, @p is bound to this_rq() and not