From 6078e88d1a5767df399cf918206bda33201cfcb7 Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Tue, 15 Dec 2020 17:55:28 +0000 Subject: [PATCH] Revert "ANDROID: cpu/hotplug: protect _cpu_down against partial HP" This reverts commit 1734af6299c346efe200d20111050ce4d78827cb. CPU Pause causes major merge conflicts with the 5.11 scheduler changes (migrate-disable specifically), so lets revert Pause temporarily as it is not needed urgently in android-mainline. Signed-off-by: Quentin Perret Change-Id: If72719521011ece234d0b176e91709d4f4c6f17b --- kernel/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index c996963325bb..5691a3c8bc92 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1000,7 +1000,7 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen, struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu); int prev_state, ret = 0; - if (num_active_cpus() == 1) + if (num_online_cpus() == 1) return -EBUSY; if (!cpu_present(cpu))