From 583c9fce71a5c9156a67738819a77ea9c95ca8a5 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 25 Jun 2019 15:56:35 +0100 Subject: [PATCH] nodemask: Don't opencode cycle_node() No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/numa.c | 4 +--- xen/common/page_alloc.c | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index b3c9c12d7f..7e1f563012 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -192,9 +192,7 @@ void __init numa_init_array(void) if ( cpu_to_node[i] != NUMA_NO_NODE ) continue; numa_set_node(i, rr); - rr = next_node(rr, node_online_map); - if ( rr == MAX_NUMNODES ) - rr = first_node(node_online_map); + rr = cycle_node(rr, node_online_map); } } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7bbb44f7d1..44a72d0b19 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -819,11 +819,8 @@ static struct page_info *get_free_buddy(unsigned int zone_lo, if ( node == NUMA_NO_NODE ) { if ( d != NULL ) - { - node = next_node(d->last_alloc_node, nodemask); - if ( node >= MAX_NUMNODES ) - node = first_node(nodemask); - } + node = cycle_node(d->last_alloc_node, nodemask); + if ( node >= MAX_NUMNODES ) node = cpu_to_node(smp_processor_id()); } -- 2.30.2