diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-11-18 14:41:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-18 14:41:02 +0100 |
| commit | b21feab0b865c36b24d7a60b55a10c7033b03159 (patch) | |
| tree | 17085747485ffad55b90839b43646d453b8e5079 /kernel/sched/core.c | |
| parent | sched/fair: Add comments for group_type and balancing at SD_NUMA level (diff) | |
| parent | Linux 5.4-rc8 (diff) | |
| download | linux-dev-b21feab0b865c36b24d7a60b55a10c7033b03159.tar.xz linux-dev-b21feab0b865c36b24d7a60b55a10c7033b03159.zip | |
Merge tag 'v5.4-rc8' into sched/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3ceff1c93ef1..2da6a005bb3f 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1065,7 +1065,7 @@ uclamp_update_active(struct task_struct *p, enum uclamp_id clamp_id) * affecting a valid clamp bucket, the next time it's enqueued, * it will already see the updated clamp bucket value. */ - if (!p->uclamp[clamp_id].active) { + if (p->uclamp[clamp_id].active) { uclamp_rq_dec_id(rq, p, clamp_id); uclamp_rq_inc_id(rq, p, clamp_id); } @@ -6021,10 +6021,11 @@ void init_idle(struct task_struct *idle, int cpu) struct rq *rq = cpu_rq(cpu); unsigned long flags; + __sched_fork(0, idle); + raw_spin_lock_irqsave(&idle->pi_lock, flags); raw_spin_lock(&rq->lock); - __sched_fork(0, idle); idle->state = TASK_RUNNING; idle->se.exec_start = sched_clock(); idle->flags |= PF_IDLE; |