ia64: move ACPI IOSAPIC locality domain mapping from pci.c to acpi.c
PATCH 1/1 ia64: move ACPI IOSAPIC locality domain mapping from pci.c to acpi.c
Move acpi_map_iosapics() from pci.c to acpi.c, since it doesn't have anything to do with PCI.
Previously posted here (no responses):
http://www.gelato.unsw.edu.au/archives/linux-ia64/0507/14683.html
Index: work-vga2/arch/ia64/kernel/acpi.c
=================================--- work-vga2.orig/arch/ia64/kernel/acpi.c 2005-09-14 16:34:53.000000000 -0600
+++ work-vga2/arch/ia64/kernel/acpi.c 2005-09-15 09:48:27.000000000 -0600
@@ -838,7 +838,7 @@
#endif /* CONFIG_ACPI_HOTPLUG_CPU */
#ifdef CONFIG_ACPI_NUMA
-acpi_status __devinit
+static acpi_status __devinit
acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) {
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -890,7 +890,16 @@
map_iosapic_to_node(gsi_base, node);
return AE_OK;
}
-#endif /* CONFIG_NUMA */
+
+static int __init
+acpi_map_iosapics (void)
+{
+ acpi_get_devices(NULL, acpi_map_iosapic, NULL, NULL);
+ return 0;
+}
+
+fs_initcall(acpi_map_iosapics);
+#endif /* CONFIG_ACPI_NUMA */
int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base) {
Index: work-vga2/arch/ia64/pci/pci.c
=================================--- work-vga2.orig/arch/ia64/pci/pci.c 2005-09-14 09:28:07.000000000 -0600
+++ work-vga2/arch/ia64/pci/pci.c 2005-09-15 09:47:05.000000000 -0600
@@ -120,29 +120,6 @@
.write = pci_write,
};
-#ifdef CONFIG_NUMA
-extern acpi_status acpi_map_iosapic(acpi_handle, u32, void *, void **); -static void acpi_map_iosapics(void)
-{
- acpi_get_devices(NULL, acpi_map_iosapic, NULL, NULL);
-}
-#else
-static void acpi_map_iosapics(void)
-{
- return;
-}
-#endif /* CONFIG_NUMA */
-
-static int __init
-pci_acpi_init (void)
-{
- acpi_map_iosapics();
-
- return 0;
-}
-
-subsys_initcall(pci_acpi_init);
-
/* Called by ACPI when it finds a new root bus. */
static struct pci_controller * __devinit