Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[pandora-kernel.git] / arch / x86 / mm / srat_32.c

diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
index 48651c6..364f36b 100644 (file)
--- a/arch/x86/mm/srat_32.c
+++ b/arch/x86/mm/srat_32.c
@@ -211,10 +211,12 @@ int __init get_memcfg_from_srat(void)
 {
        int i, j, nid;
 
-
        if (srat_disabled())
                goto out_fail;
 
+       if (acpi_numa_init() < 0)
+               goto out_fail;
+
        if (num_memory_chunks == 0) {
                printk(KERN_DEBUG
                         "could not find any ACPI SRAT memory areas.\n");