[PATCH] ia64: fix NUMA boot

Now that the ACPI table parsing stuff has been fixed we can move
find_memory() back where it belongs--after the SRAT table has been
parsed.

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index e63485e53c7f8f2b567198e2dc27661dc7b565f6..ec0d5a2a49a2e80b9acc005d98d3069df58aad96 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -235,7 +235,6 @@ setup_arch (char **cmdline_p)
        strlcpy(saved_command_line, *cmdline_p, sizeof(saved_command_line));
 
        efi_init();
-       find_memory();
 
 #ifdef CONFIG_ACPI_BOOT
        /* Initialize the ACPI boot-time table parser */
@@ -249,6 +248,8 @@ setup_arch (char **cmdline_p)
 # endif
 #endif /* CONFIG_APCI_BOOT */
 
+       find_memory();
+
        /* process SAL system table: */
        ia64_sal_init(efi.sal_systab);