diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2017-08-10 12:02:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2017-08-10 12:02:26 +0200 |
| commit | 1ccb2f4e8e435a53bb378e8b092087f091754aa6 (patch) | |
| tree | ba120509947138915e06ad39cca5f065bd99f42f /kernel/sched/core.c | |
| parent | Merge tag 'perf-core-for-mingo-4.14-20170728' of git://git.kernel.org/pub/scm... (diff) | |
| parent | perf/core: Fix time on IOC_ENABLE (diff) | |
| download | linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.tar.gz linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.tar.bz2 linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
| -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 17c667b427b4..0869b20fba81 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 |