Both memory_nodes_parsed and processor_nodes_parsed are using for Arm and x86 to record parded NUMA memory and CPU. So we move them to common.
Signed-off-by: Wei Chen <[email protected]> --- xen/arch/arm/numa_device_tree.c | 2 -- xen/arch/x86/srat.c | 3 --- xen/common/numa.c | 3 +++ xen/include/xen/nodemask.h | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/numa_device_tree.c b/xen/arch/arm/numa_device_tree.c index 27ffb72f7b..f74b7f6427 100644 --- a/xen/arch/arm/numa_device_tree.c +++ b/xen/arch/arm/numa_device_tree.c @@ -25,8 +25,6 @@ #include <asm/setup.h> s8 device_tree_numa = 0; -static nodemask_t processor_nodes_parsed __initdata; -static nodemask_t memory_nodes_parsed __initdata; static int srat_disabled(void) { diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 2298353846..dd3aa30843 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -24,9 +24,6 @@ static struct acpi_table_slit *__read_mostly acpi_slit; -static nodemask_t memory_nodes_parsed __initdata; -static nodemask_t processor_nodes_parsed __initdata; - struct pxm2node { unsigned pxm; nodeid_t node; diff --git a/xen/common/numa.c b/xen/common/numa.c index 26c0006d04..79ab250543 100644 --- a/xen/common/numa.c +++ b/xen/common/numa.c @@ -35,6 +35,9 @@ int num_node_memblks; struct node node_memblk_range[NR_NODE_MEMBLKS]; nodeid_t memblk_nodeid[NR_NODE_MEMBLKS]; +nodemask_t memory_nodes_parsed __initdata; +nodemask_t processor_nodes_parsed __initdata; + bool numa_off; /* diff --git a/xen/include/xen/nodemask.h b/xen/include/xen/nodemask.h index 1dd6c7458e..29ce5e28e7 100644 --- a/xen/include/xen/nodemask.h +++ b/xen/include/xen/nodemask.h @@ -276,6 +276,8 @@ static inline int __cycle_node(int n, const nodemask_t *maskp, int nbits) */ extern nodemask_t node_online_map; +extern nodemask_t memory_nodes_parsed; +extern nodemask_t processor_nodes_parsed; #if MAX_NUMNODES > 1 #define num_online_nodes() nodes_weight(node_online_map) -- 2.25.1
