From ca59313305d86340151c6cc2565d8717f6a15870 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Aug 2022 17:02:23 +0200 Subject: [PATCH] Revert "ANDROID: sched: Make uclamp changes depend on CAP_SYS_NICE" This reverts commit 0bb784e62322f9f989a087c8cbc793cd1ddbdcbf. It causes merge conflicts in 6.0-rc1 and so needs to be reverted. If it is still needed, it can come back after 6.0-rc1. Bug: 187186685 Cc: Quentin Perret Signed-off-by: Greg Kroah-Hartman Change-Id: I02bba37a97e0d5f8f4e38c4b880d620ef788f334 --- kernel/sched/core.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2ee3c060199e..9a33f05f7e4d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7457,10 +7457,6 @@ static int __sched_setscheduler(struct task_struct *p, /* Normal users shall not reset the sched_reset_on_fork flag: */ if (p->sched_reset_on_fork && !reset_on_fork) return -EPERM; - - /* Can't change util-clamps */ - if (attr->sched_flags & SCHED_FLAG_UTIL_CLAMP) - return -EPERM; } if (user) {