partition_and_rebuild_sched_domains() and partition_sched_domains() are now equivalent. Remove the former as a nice clean up. Suggested-by: Waiman Long <llong@xxxxxxxxxx> Reviewed-by: Waiman Long <llong@xxxxxxxxxx> Reviewed-by: Shrikanth Hegde <sshegde@xxxxxxxxxxxxx> Reviewed-by: Valentin Schneider <vschneid@xxxxxxxxxx> Tested-by: Waiman Long <longman@xxxxxxxxxx> Tested-by: Jon Hunter <jonathanh@xxxxxxxxxx> Signed-off-by: Juri Lelli <juri.lelli@xxxxxxxxxx> --- kernel/cgroup/cpuset.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 1892dc8cd211..a51099e5d587 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -993,15 +993,6 @@ void dl_rebuild_rd_accounting(void) rcu_read_unlock(); } -static void -partition_and_rebuild_sched_domains(int ndoms_new, cpumask_var_t doms_new[], - struct sched_domain_attr *dattr_new) -{ - sched_domains_mutex_lock(); - partition_sched_domains_locked(ndoms_new, doms_new, dattr_new); - sched_domains_mutex_unlock(); -} - /* * Rebuild scheduler domains. * @@ -1063,7 +1054,7 @@ void rebuild_sched_domains_locked(void) ndoms = generate_sched_domains(&doms, &attr); /* Have scheduler rebuild the domains */ - partition_and_rebuild_sched_domains(ndoms, doms, attr); + partition_sched_domains(ndoms, doms, attr); } #else /* !CONFIG_SMP */ void rebuild_sched_domains_locked(void) -- 2.48.1