Merge tag 'x86-mm-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[sfrench/cifs-2.6.git] / arch / x86 / mm / numa.c

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index aa39d678fe81d8e26d81a4104cb5ab25788affa8..4a17f663f949a7ecea961e94d2b4edbf754c43d7 100644 (file)
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -3,6 +3,7 @@
 #include <linux/acpi.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/of.h>
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/memblock.h>
@@ -727,6 +728,8 @@ void __init x86_numa_init(void)
                if (!numa_init(amd_numa_init))
                        return;
 #endif
+               if (acpi_disabled && !numa_init(of_numa_init))
+                       return;
        }
 
        numa_init(dummy_numa_init);