diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-30 11:54:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-30 11:54:08 -0700 |
| commit | e4776b8ccbdc4b8a0744641cd66197a91ec37689 (patch) | |
| tree | 6c7d223618b6b4ff8e532d6eb3663e6e9839f325 /kernel | |
| parent | dbc52a80308c237a2ee0e46e63fdbfbcb518978e (diff) | |
| parent | 6c423f5751b9f68bfe7c7545519d4c7159f93e1b (diff) | |
| download | op-kernel-dev-e4776b8ccbdc4b8a0744641cd66197a91ec37689.zip op-kernel-dev-e4776b8ccbdc4b8a0744641cd66197a91ec37689.tar.gz | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 17c667b..0869b20 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2069,7 +2069,7 @@ out: /** * try_to_wake_up_local - try to wake up a local task with rq lock held * @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 * ensure that this_rq() is locked, @p is bound to this_rq() and not |
