Skip to content

Commit

Permalink
[IA64] move ACPI IOSAPIC locality domain mapping from pci.c to acpi.c
Browse files Browse the repository at this point in the history
Move acpi_map_iosapics() from pci.c to acpi.c, since it doesn't
have anything to do with PCI.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Bjorn Helgaas authored and Tony Luck committed Sep 19, 2005
1 parent 044a500 commit 650316f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 25 deletions.
13 changes: 11 additions & 2 deletions arch/ia64/kernel/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ EXPORT_SYMBOL(acpi_unmap_lsapic);
#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 };
Expand Down Expand Up @@ -890,7 +890,16 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
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)
{
Expand Down
23 changes: 0 additions & 23 deletions arch/ia64/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,29 +120,6 @@ struct pci_ops pci_root_ops = {
.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
Expand Down

0 comments on commit 650316f

Please sign in to comment.