path: root/kernel
diff options
authorLinus Torvalds <>2021-06-18 10:42:36 -0700
committerLinus Torvalds <>2021-06-18 10:42:36 -0700
commit944293bcee92acb1cfbbd315f833b4384bfd35fa (patch)
tree5227b12f3297b3d8a305448f3e43f6b2f3b33851 /kernel
parente2c8f8e57ba66aa4bef6990bc9228a29440cf987 (diff)
parent771fac5e26c17845de8c679e6a947a4371e86ffc (diff)
Merge tag 'pm-5.13-rc7' of git://
Pull power management fix from Rafael Wysocki: "Remove recently added frequency invariance support from the CPPC cpufreq driver, because it has turned out to be problematic and it cannot be fixed properly on time for 5.13 (Viresh Kumar)" * tag 'pm-5.13-rc7' of git:// Revert "cpufreq: CPPC: Add support for frequency invariance"
Diffstat (limited to 'kernel')
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 5226cc26a095..4ca80df205ce 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6389,7 +6389,6 @@ int sched_setattr_nocheck(struct task_struct *p, const struct sched_attr *attr)
return __sched_setscheduler(p, attr, false, true);
* sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace.