Commit 0ac824f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-5.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup fix from Tejun Heo:
 "Waiman's fix for a cgroup2 cpuset bug where it could miss nodes which
  were hot-added"

* 'for-5.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp()
parents c37dba6a 2685027f

kernel/cgroup/cpuset.c

+5 −2
Original line number Diff line number Diff line
@@ -3390,8 +3390,11 @@ static struct notifier_block cpuset_track_online_nodes_nb = { 
 */

void __init cpuset_init_smp(void)

{

	cpumask_copy(top_cpuset.cpus_allowed, cpu_active_mask);

	top_cpuset.mems_allowed = node_states[N_MEMORY];

	/*

	 * cpus_allowd/mems_allowed set to v2 values in the initial

	 * cpuset_bind() call will be reset to v1 values in another

	 * cpuset_bind() call when v1 cpuset is mounted.

	 */

	top_cpuset.old_mems_allowed = top_cpuset.mems_allowed;



	cpumask_copy(top_cpuset.effective_cpus, cpu_active_mask);