Since commit dfa50b605c2a ("sched: Make finish_task_switch() return 'struct rq *'"), prev == current is incorrect in finish_task_switch(). Also fix a typo in the comment of struct dl_bandwidth.
Signed-off-by: Miaohe Lin <linmia...@huawei.com> --- kernel/sched/core.c | 4 ++-- kernel/sched/sched.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8471a0f7eb32..725ccab230da 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3571,8 +3571,8 @@ prepare_task_switch(struct rq *rq, struct task_struct *prev, * * The context switch have flipped the stack from under us and restored the * local variables which were saved when this task called schedule() in the - * past. prev == current is still correct but we need to recalculate this_rq - * because prev may have moved to another CPU. + * past. We need to recalculate this_rq because prev may have moved to + * another CPU. */ static struct rq *finish_task_switch(struct task_struct *prev) __releases(rq->lock) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 28709f6b0975..1d7e45f7fbb9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -278,7 +278,7 @@ void __dl_clear_params(struct task_struct *p); * consume bandwidth on the CPU they're running on. * Finally, dl_total_bw_cpu is used to cache the index of dl_total_bw * that will be shown the next time the proc or cgroup controls will - * be red. It on its turn can be changed by writing on its own + * be read. It on its turn can be changed by writing on its own * control. */ struct dl_bandwidth { -- 2.19.1