Commit c149c4a4 authored by Xiu Jianfeng's avatar Xiu Jianfeng Committed by Tejun Heo
Browse files

cgroup/cpuset: Remove cpuset_slab_spread_rotor 



Since the SLAB implementation was removed in v6.8, so the
cpuset_slab_spread_rotor is no longer used and can be removed.

Signed-off-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent d72a00a8

include/linux/cpuset.h

+0 −6
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ extern int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns, 
			    struct pid *pid, struct task_struct *tsk);



extern int cpuset_mem_spread_node(void);

extern int cpuset_slab_spread_node(void);



static inline int cpuset_do_page_mem_spread(void)

{
@@ -246,11 +245,6 @@ static inline int cpuset_mem_spread_node(void) 
	return 0;

}



static inline int cpuset_slab_spread_node(void)

{

	return 0;

}



static inline int cpuset_do_page_mem_spread(void)

{

	return 0;

include/linux/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -1243,7 +1243,6 @@ struct task_struct { 
	/* Sequence number to catch updates: */

	seqcount_spinlock_t		mems_allowed_seq;

	int				cpuset_mem_spread_rotor;

	int				cpuset_slab_spread_rotor;

#endif

#ifdef CONFIG_CGROUPS

	/* Control Group info protected by css_set_lock: */

kernel/cgroup/cpuset.c

+0 −13
Original line number Diff line number Diff line
@@ -5012,19 +5012,6 @@ int cpuset_mem_spread_node(void) 
	return cpuset_spread_node(&current->cpuset_mem_spread_rotor);

}



/**

 * cpuset_slab_spread_node() - On which node to begin search for a slab page

 */

int cpuset_slab_spread_node(void)

{

	if (current->cpuset_slab_spread_rotor == NUMA_NO_NODE)

		current->cpuset_slab_spread_rotor =

			node_random(&current->mems_allowed);



	return cpuset_spread_node(&current->cpuset_slab_spread_rotor);

}

EXPORT_SYMBOL_GPL(cpuset_mem_spread_node);



/**

 * cpuset_mems_allowed_intersects - Does @tsk1's mems_allowed intersect @tsk2's?

 * @tsk1: pointer to task_struct of some task.

kernel/fork.c

+0 −1
Original line number Diff line number Diff line
@@ -2311,7 +2311,6 @@ __latent_entropy struct task_struct *copy_process( 
#endif

#ifdef CONFIG_CPUSETS

	p->cpuset_mem_spread_rotor = NUMA_NO_NODE;

	p->cpuset_slab_spread_rotor = NUMA_NO_NODE;

	seqcount_spinlock_init(&p->mems_allowed_seq, &p->alloc_lock);

#endif

#ifdef CONFIG_TRACE_IRQFLAGS