diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-08-10 09:05:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-08-10 09:05:43 +0200 |
| commit | b41bbb33cf75d251a816768580819aec17be718d (patch) | |
| tree | f50ecdfa8f7608af122e6215b7a967265085fb32 /kernel/sched/core.c | |
| parent | 88c56cfeaec4642aee8aac58b38d5708c6aae0d3 (diff) | |
| parent | d07f09a1f99cabbc86bc5c97d962eb8a466106b5 (diff) | |
| download | linux-b41bbb33cf75d251a816768580819aec17be718d.tar.gz linux-b41bbb33cf75d251a816768580819aec17be718d.tar.bz2 linux-b41bbb33cf75d251a816768580819aec17be718d.zip | |
Merge branch 'sched/eevdf' into sched/core
Pick up the EEVDF work into the main branch - it's looking good so far.
Conflicts:
kernel/sched/features.h
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, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 614271a75525..a97eab3e775a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4527,6 +4527,8 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) p->se.prev_sum_exec_runtime = 0; p->se.nr_migrations = 0; p->se.vruntime = 0; + p->se.vlag = 0; + p->se.slice = sysctl_sched_base_slice; INIT_LIST_HEAD(&p->se.group_node); #ifdef CONFIG_FAIR_GROUP_SCHED |