Merge commit 'v2.6.39-rc3' into for-2.6.39

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
index 48651c6f657d..364f36bdfad8 100644
--- 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");