On 9/24/2023 7:05 PM, Yury Norov wrote:
> Now that the only user of for_each_numa_hop_mask() is switched to using
> cpumask_local_spread(), for_each_numa_hop_mask() is a dead code. Thus,
> revert commit 06ac01721f7d ("sched/topology: Introduce
> for_each_numa_hop_mask()").
>
> Signed-off-by: Yury Norov <yury.norov@xxxxxxxxx>
> Signed-off-by: Yury Norov <ynorov@xxxxxxxxxx>
> ---
> include/linux/topology.h | 18 ------------------
> 1 file changed, 18 deletions(-)
>
> diff --git a/include/linux/topology.h b/include/linux/topology.h
> index fea32377f7c7..344c2362755a 100644
> --- a/include/linux/topology.h
> +++ b/include/linux/topology.h
> @@ -261,22 +261,4 @@ sched_numa_hop_mask(unsigned int node, unsigned int hops)
> }
> #endif /* CONFIG_NUMA */
>
Reviewed-by: Jacob Keller <jacob.e.keller@xxxxxxxxx>
I might have squashed all of 2 through 4 into a single patch but not a
big deal.
> -/**
> - * for_each_numa_hop_mask - iterate over cpumasks of increasing NUMA distance
> - * from a given node.
> - * @mask: the iteration variable.
> - * @node: the NUMA node to start the search from.
> - *
> - * Requires rcu_lock to be held.
> - *
> - * Yields cpu_online_mask for @node == NUMA_NO_NODE.
> - */
> -#define for_each_numa_hop_mask(mask, node) \
> - for (unsigned int __hops = 0; \
> - mask = (node != NUMA_NO_NODE || __hops) ? \
> - sched_numa_hop_mask(node, __hops) : \
> - cpu_online_mask, \
> - !IS_ERR_OR_NULL(mask); \
> - __hops++)
> -
> #endif /* _LINUX_TOPOLOGY_H */
