Revert "ANDROID: cpu: Don't prevent hotplug from DL/BATCH/IDLE"

This reverts commit 9da1f37103.

It causes merge problems with 5.19-rc1 and should no longer be needed at
all.

Bug: 169238689
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I27de2776905401b42c4e5cf2be784eae18f8816b
This commit is contained in:
Greg Kroah-Hartman 2022-06-04 18:19:13 +02:00
parent fbab598aa0
commit d014869ae8

View File

@ -1333,8 +1333,10 @@ static int switch_to_rt_policy(void)
if (policy == SCHED_NORMAL)
/* Switch to SCHED_FIFO from SCHED_NORMAL. */
return sched_setscheduler_nocheck(current, SCHED_FIFO, &param);
else
else if (policy == SCHED_FIFO || policy == SCHED_RR)
return 1;
else
return -EPERM;
}
static int switch_to_fair_policy(void)
@ -1430,6 +1432,8 @@ static int cpu_up(unsigned int cpu, enum cpuhp_state target)
*/
switch_err = switch_to_rt_policy();
if (switch_err < 0)
return switch_err;
err = try_online_node(cpu_to_node(cpu));
if (err)