Snap for 9542222 from c7599df86e to android12-5.10-keystone-qcom-release

Change-Id: I0d73a64b01dc0135682231e521d267d5883a6ae5
This commit is contained in:
Android Build Coastguard Worker
2023-01-31 01:00:31 +00:00

View File

@@ -1159,7 +1159,7 @@ int remove_cpu(unsigned int cpu)
} }
EXPORT_SYMBOL_GPL(remove_cpu); EXPORT_SYMBOL_GPL(remove_cpu);
extern bool dl_cpu_busy(unsigned int cpu); extern int dl_cpu_busy(int cpu, struct task_struct *p);
int __pause_drain_rq(struct cpumask *cpus) int __pause_drain_rq(struct cpumask *cpus)
{ {
@@ -1234,7 +1234,7 @@ int pause_cpus(struct cpumask *cpus)
cpumask_and(cpus, cpus, cpu_active_mask); cpumask_and(cpus, cpus, cpu_active_mask);
for_each_cpu(cpu, cpus) { for_each_cpu(cpu, cpus) {
if (!cpu_online(cpu) || dl_cpu_busy(cpu) || if (!cpu_online(cpu) || dl_cpu_busy(cpu, NULL) ||
get_cpu_device(cpu)->offline_disabled == true) { get_cpu_device(cpu)->offline_disabled == true) {
err = -EBUSY; err = -EBUSY;
goto err_cpu_maps_update; goto err_cpu_maps_update;