Commit 62fec43e authored by Jesse Barnes's avatar Jesse Barnes Committed by Tony Luck

[IA64] pci.c: fix warning

Fix a 'mixing code and declarations' warning in pci.c by creating a small
function that's a no-op if CONFIG_NUMA=n but otherwise includes the proper
extern. Similar patch also submitted by <matthew@wil.cx>
Signed-off-by: default avatarJesse Barnes <jbarnes@sgi.com>
parent 8492af96
...@@ -132,6 +132,19 @@ struct pci_ops pci_root_ops = { ...@@ -132,6 +132,19 @@ struct pci_ops pci_root_ops = {
.write = pci_write, .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 static int __init
pci_acpi_init (void) pci_acpi_init (void)
{ {
...@@ -139,11 +152,7 @@ pci_acpi_init (void) ...@@ -139,11 +152,7 @@ pci_acpi_init (void)
printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n"); printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
#ifdef CONFIG_NUMA acpi_map_iosapics();
extern acpi_status acpi_map_iosapic (acpi_handle, u32, void*, void**);
acpi_get_devices(NULL, acpi_map_iosapic, NULL, NULL);
#endif
if (pci_routeirq) { if (pci_routeirq) {
/* /*
......
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