Merge 5.10-rc7 into android-mainline
Linux 5.10-rc7 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ie61b3510311a825ee57bee12610e25bc1500b350
This commit is contained in:
@@ -820,6 +820,10 @@ void __init cpuhp_threads_init(void)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
#ifndef arch_clear_mm_cpumask_cpu
|
||||
#define arch_clear_mm_cpumask_cpu(cpu, mm) cpumask_clear_cpu(cpu, mm_cpumask(mm))
|
||||
#endif
|
||||
|
||||
/**
|
||||
* clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU
|
||||
* @cpu: a CPU id
|
||||
@@ -855,7 +859,7 @@ void clear_tasks_mm_cpumask(int cpu)
|
||||
t = find_lock_task_mm(p);
|
||||
if (!t)
|
||||
continue;
|
||||
cpumask_clear_cpu(cpu, mm_cpumask(t->mm));
|
||||
arch_clear_mm_cpumask_cpu(cpu, t->mm);
|
||||
task_unlock(t);
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
Reference in New Issue
Block a user