提交 b1beed72 编写于 作者: Y Yury Norov 提交者: Jakub Kicinski

lib/cpumask: reorganize cpumask_local_spread() logic

Now after moving all NUMA logic into sched_numa_find_nth_cpu(),
else-branch of cpumask_local_spread() is just a function call, and
we can simplify logic by using ternary operator.

While here, replace BUG() with WARN_ON().
Signed-off-by: NYury Norov <yury.norov@gmail.com>
Acked-by: NTariq Toukan <tariqt@nvidia.com>
Reviewed-by: NJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: NPeter Lafreniere <peter@n8pjl.ca>
Signed-off-by: NJakub Kicinski <kuba@kernel.org>
上级 406d394a
...@@ -127,16 +127,12 @@ unsigned int cpumask_local_spread(unsigned int i, int node) ...@@ -127,16 +127,12 @@ unsigned int cpumask_local_spread(unsigned int i, int node)
/* Wrap: we always want a cpu. */ /* Wrap: we always want a cpu. */
i %= num_online_cpus(); i %= num_online_cpus();
if (node == NUMA_NO_NODE) { cpu = (node == NUMA_NO_NODE) ?
cpu = cpumask_nth(i, cpu_online_mask); cpumask_nth(i, cpu_online_mask) :
if (cpu < nr_cpu_ids) sched_numa_find_nth_cpu(cpu_online_mask, i, node);
return cpu;
} else { WARN_ON(cpu >= nr_cpu_ids);
cpu = sched_numa_find_nth_cpu(cpu_online_mask, i, node); return cpu;
if (cpu < nr_cpu_ids)
return cpu;
}
BUG();
} }
EXPORT_SYMBOL(cpumask_local_spread); EXPORT_SYMBOL(cpumask_local_spread);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册