Skip to content

Commit

Permalink
[PATCH] powerpc: fix for "Update OF address parsers"
Browse files Browse the repository at this point in the history
This allows iSeries to build again.  It just moves pci_address_to_pio
outside the #ifdef CONFIG_PPC_MULTIPLATFORM.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Jan 9, 2006
1 parent e07102d commit d4e4b35
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions arch/powerpc/kernel/pci_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -1181,20 +1181,6 @@ void phbs_remap_io(void)
remap_bus_range(hose->bus);
}

unsigned int pci_address_to_pio(phys_addr_t address)
{
struct pci_controller *hose, *tmp;

list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
if (address >= hose->io_base_phys &&
address < (hose->io_base_phys + hose->pci_io_size))
return (unsigned int)hose->io_base_virt +
(address - hose->io_base_phys);
}
return (unsigned int)-1;
}
EXPORT_SYMBOL_GPL(pci_address_to_pio);

static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)
{
struct pci_controller *hose = pci_bus_to_host(dev->bus);
Expand Down Expand Up @@ -1337,6 +1323,20 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)

#endif /* CONFIG_PPC_MULTIPLATFORM */

unsigned int pci_address_to_pio(phys_addr_t address)
{
struct pci_controller *hose, *tmp;

list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
if (address >= hose->io_base_phys &&
address < (hose->io_base_phys + hose->pci_io_size))
return (unsigned int)hose->io_base_virt +
(address - hose->io_base_phys);
}
return (unsigned int)-1;
}
EXPORT_SYMBOL_GPL(pci_address_to_pio);


#define IOBASE_BRIDGE_NUMBER 0
#define IOBASE_MEMORY 1
Expand Down

0 comments on commit d4e4b35

Please sign in to comment.