Commit ecddf16d authored by Jesse Barnes's avatar Jesse Barnes Committed by David Mosberger

[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.
parent dd1a7550
...@@ -235,7 +235,6 @@ setup_arch (char **cmdline_p) ...@@ -235,7 +235,6 @@ setup_arch (char **cmdline_p)
strlcpy(saved_command_line, *cmdline_p, sizeof(saved_command_line)); strlcpy(saved_command_line, *cmdline_p, sizeof(saved_command_line));
efi_init(); efi_init();
find_memory();
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI_BOOT
/* Initialize the ACPI boot-time table parser */ /* Initialize the ACPI boot-time table parser */
...@@ -249,6 +248,8 @@ setup_arch (char **cmdline_p) ...@@ -249,6 +248,8 @@ setup_arch (char **cmdline_p)
# endif # endif
#endif /* CONFIG_APCI_BOOT */ #endif /* CONFIG_APCI_BOOT */
find_memory();
/* process SAL system table: */ /* process SAL system table: */
ia64_sal_init(efi.sal_systab); ia64_sal_init(efi.sal_systab);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment