Not only x86 ACPI need this macro. Device tree based NUMA also needs this macro to present max memory block number. So we move it from x86 ACPI header file to common NUMA header file.
Signed-off-by: Wei Chen <[email protected]> --- xen/include/asm-x86/acpi.h | 1 - xen/include/xen/numa.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index 7032f3a001..d347500a3c 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -103,7 +103,6 @@ extern unsigned long acpi_wakeup_address; extern s8 acpi_numa; extern int acpi_scan_nodes(u64 start, u64 end); -#define NR_NODE_MEMBLKS (MAX_NUMNODES*2) extern struct acpi_sleep_info acpi_sinfo; #define acpi_video_flags bootsym(video_flags) diff --git a/xen/include/xen/numa.h b/xen/include/xen/numa.h index f9769cba4b..5af74b357f 100644 --- a/xen/include/xen/numa.h +++ b/xen/include/xen/numa.h @@ -11,6 +11,7 @@ #define NUMA_NO_DISTANCE 0xFF #define MAX_NUMNODES (1 << NODES_SHIFT) +#define NR_NODE_MEMBLKS (MAX_NUMNODES*2) #define vcpu_to_node(v) (cpu_to_node((v)->processor)) -- 2.25.1
