From: Vijaya Kumar K <vijaya.ku...@cavium.com>
The common code allows numa initialization only when
ACPI_NUMA config is enabled. Allow initialization when
NUMA config is enabled for DT.
In this patch, along with acpi_numa, check for acpi_disabled
is added.
Signed-off-by: Vijaya Kumar K <vijaya.ku...@cavium.com>
---
xen/common/numa.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/xen/common/numa.c b/xen/common/numa.c
index 74c4697..5e985d2 100644
--- a/xen/common/numa.c
+++ b/xen/common/numa.c
@@ -324,7 +324,7 @@ static int __init numa_scan_nodes(paddr_t start, paddr_t
end)
for ( i = 0; i < MAX_NUMNODES; i++ )
cutoff_node(i, start, end);
- if ( acpi_numa <= 0 )
+ if ( !acpi_disabled && acpi_numa <= 0 )
return -1;
if ( !arch_sanitize_nodes_memory() )
@@ -430,11 +430,9 @@ void __init numa_initmem_init(unsigned long start_pfn,
unsigned long end_pfn)
return;
#endif
-#ifdef CONFIG_ACPI_NUMA
if ( !numa_off &&
!numa_scan_nodes(pfn_to_paddr(start_pfn), pfn_to_paddr(end_pfn)) )
return;
-#endif
printk(KERN_INFO "%s\n",
numa_off ? "NUMA turned off" : "No NUMA configuration found");
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
