summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-04-25 12:11:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-04-25 12:11:47 -0700
commit05db498ad94431315c73efe623eab7a7d2d961c6 (patch)
treec28ba9874d2bd9ddec664668c0feb5b20793fbab /kernel
parente18588005d79853c2d4101f9416e7c1e8c9584d2 (diff)
parenteaf5a92ebde5bca3bb2565616115bd6d579486cd (diff)
downloadlinux-stable-05db498ad94431315c73efe623eab7a7d2d961c6.tar.gz
linux-stable-05db498ad94431315c73efe623eab7a7d2d961c6.tar.bz2
linux-stable-05db498ad94431315c73efe623eab7a7d2d961c6.zip
Merge tag 'sched-urgent-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar: "Misc fixes: - an uclamp accounting fix - three frequency invariance fixes and a readability improvement" * tag 'sched-urgent-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/core: Fix reset-on-fork from RT with uclamp x86, sched: Move check for CPU type to caller function x86, sched: Don't enable static key when starting secondary CPUs x86, sched: Account for CPUs with less than 4 cores in freq. invariance x86, sched: Bail out of frequency invariance if base frequency is unknown
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/core.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3a61a3b8eaa9..9a2fbf98fd6f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1232,13 +1232,8 @@ static void uclamp_fork(struct task_struct *p)
return;
for_each_clamp_id(clamp_id) {
- unsigned int clamp_value = uclamp_none(clamp_id);
-
- /* By default, RT tasks always get 100% boost */
- if (unlikely(rt_task(p) && clamp_id == UCLAMP_MIN))
- clamp_value = uclamp_none(UCLAMP_MAX);
-
- uclamp_se_set(&p->uclamp_req[clamp_id], clamp_value, false);
+ uclamp_se_set(&p->uclamp_req[clamp_id],
+ uclamp_none(clamp_id), false);
}
}