diff options
author | gallatin <gallatin@FreeBSD.org> | 2002-02-28 18:18:41 +0000 |
---|---|---|
committer | gallatin <gallatin@FreeBSD.org> | 2002-02-28 18:18:41 +0000 |
commit | 3af87f82d6519487f875dd2c58e1d74aec880a69 (patch) | |
tree | c59214d297698d7c73c4ce5df6b071d49301f8f5 | |
parent | 1de506bf4e9b7b28ddfc2c5f88711e85f853998a (diff) | |
download | FreeBSD-src-3af87f82d6519487f875dd2c58e1d74aec880a69.zip FreeBSD-src-3af87f82d6519487f875dd2c58e1d74aec880a69.tar.gz |
recover from namespace collision caused by un-static'ing pci_alloc_resource()
in rev 1.187 of sys/dev/pci/pci.c
-rw-r--r-- | sys/alpha/pci/apecs_pci.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/cia_pci.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/irongate_pci.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/lca_pci.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/pcibus.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/pcibus.h | 2 | ||||
-rw-r--r-- | sys/alpha/pci/t2_pci.c | 2 | ||||
-rw-r--r-- | sys/alpha/pci/tsunami_pci.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/sys/alpha/pci/apecs_pci.c b/sys/alpha/pci/apecs_pci.c index fffb759..749398e 100644 --- a/sys/alpha/pci/apecs_pci.c +++ b/sys/alpha/pci/apecs_pci.c @@ -82,7 +82,7 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, (type == SYS_RES_IRQ)) return isa_alloc_intr(bus, child, start); else - return pci_alloc_resource(bus, child, type, rid, + return alpha_pci_alloc_resource(bus, child, type, rid, start, end, count, flags); } diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c index 9fafbf4..2f6b515 100644 --- a/sys/alpha/pci/cia_pci.c +++ b/sys/alpha/pci/cia_pci.c @@ -415,7 +415,7 @@ static device_method_t cia_pcib_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, cia_pcib_read_ivar), - DEVMETHOD(bus_alloc_resource, pci_alloc_resource), + DEVMETHOD(bus_alloc_resource, alpha_pci_alloc_resource), DEVMETHOD(bus_release_resource, pci_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), diff --git a/sys/alpha/pci/irongate_pci.c b/sys/alpha/pci/irongate_pci.c index ab0c27b..31a81a5 100644 --- a/sys/alpha/pci/irongate_pci.c +++ b/sys/alpha/pci/irongate_pci.c @@ -189,7 +189,7 @@ static device_method_t irongate_pcib_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, irongate_pcib_read_ivar), - DEVMETHOD(bus_alloc_resource, pci_alloc_resource), + DEVMETHOD(bus_alloc_resource, alpha_pci_alloc_resource), DEVMETHOD(bus_release_resource, pci_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), diff --git a/sys/alpha/pci/lca_pci.c b/sys/alpha/pci/lca_pci.c index 02f186e..0097409 100644 --- a/sys/alpha/pci/lca_pci.c +++ b/sys/alpha/pci/lca_pci.c @@ -80,7 +80,7 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, if (type == SYS_RES_IRQ) return isa_alloc_intr(bus, child, start); else - return pci_alloc_resource(bus, child, type, rid, + return alpha_pci_alloc_resource(bus, child, type, rid, start, end, count, flags); } diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c index 71a3eb1..55fe1f7 100644 --- a/sys/alpha/pci/pcibus.c +++ b/sys/alpha/pci/pcibus.c @@ -217,7 +217,7 @@ pci_init_resources(void) * child of one of our descendants, not a direct child of the pci chipset. */ struct resource * -pci_alloc_resource(device_t bus, device_t child, int type, int *rid, +alpha_pci_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { struct rman *rm; diff --git a/sys/alpha/pci/pcibus.h b/sys/alpha/pci/pcibus.h index aa3e105..608b2a5 100644 --- a/sys/alpha/pci/pcibus.h +++ b/sys/alpha/pci/pcibus.h @@ -27,7 +27,7 @@ */ void pci_init_resources(void); -struct resource *pci_alloc_resource(device_t bus, device_t child, +struct resource *alpha_pci_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); diff --git a/sys/alpha/pci/t2_pci.c b/sys/alpha/pci/t2_pci.c index b50555f..ac2d6a8 100644 --- a/sys/alpha/pci/t2_pci.c +++ b/sys/alpha/pci/t2_pci.c @@ -180,7 +180,7 @@ static device_method_t t2_pcib_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, t2_pcib_read_ivar), - DEVMETHOD(bus_alloc_resource, pci_alloc_resource), + DEVMETHOD(bus_alloc_resource, alpha_pci_alloc_resource), DEVMETHOD(bus_release_resource, pci_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), diff --git a/sys/alpha/pci/tsunami_pci.c b/sys/alpha/pci/tsunami_pci.c index 495161c..9af0ddc 100644 --- a/sys/alpha/pci/tsunami_pci.c +++ b/sys/alpha/pci/tsunami_pci.c @@ -260,7 +260,7 @@ static device_method_t tsunami_pcib_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, tsunami_pcib_read_ivar), - DEVMETHOD(bus_alloc_resource, pci_alloc_resource), + DEVMETHOD(bus_alloc_resource, alpha_pci_alloc_resource), DEVMETHOD(bus_release_resource, pci_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), |