x86/numa: Add Devicetree support

[linux-2.6-microblaze.git] / arch / x86 / mm / numa.c

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 2aadb20..c79f12e 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>
@@ -733,6 +734,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);