talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recover from namespace collision caused by un-static'ing pci_alloc_resource() 

in rev  1.187 of sys/dev/pci/pci.c
This commit is contained in:
Andrew Gallatin 2002-02-28 18:18:41 +00:00
parent 6df66172e3
commit 030cb46918
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/alpha/pci/apecs_pci.c
View File

@ -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);
}

2
sys/alpha/pci/cia_pci.c
View File

@ -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),

2
sys/alpha/pci/irongate_pci.c
View File

@ -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),

2
sys/alpha/pci/lca_pci.c
View File

@ -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);
}

2
sys/alpha/pci/pcibus.c
View File

@ -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;

2
sys/alpha/pci/pcibus.h
View File

@ -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);

2
sys/alpha/pci/t2_pci.c
View File

@ -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),

2
sys/alpha/pci/tsunami_pci.c
View File

@ -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),