Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak...

diff --combined arch/powerpc/kernel/pci-common.c
index 74a8fd450f67f84dc518987f62cba10b64b985b3,7b41a99baae4d3d95c38e985f375c6a522d8292e..083cfbdbe0b2d7ed86edeb2ab55d5a7284fd8a91
--- 1/arch/powerpc/kernel/pci-common.c
--- 2/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@@ -65,7 -65,7 +65,7 @@@ static void __devinit pci_setup_pci_con
        spin_unlock(&hose_spinlock);
  }
  
- struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
+ __init_refok struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
  {
        struct pci_controller *phb;
  
@@@ -101,29 -101,6 +101,29 @@@ void pcibios_free_controller(struct pci
                kfree(phb);
  }
  
 +int pcibios_vaddr_is_ioport(void __iomem *address)
 +{
 +      int ret = 0;
 +      struct pci_controller *hose;
 +      unsigned long size;
 +
 +      spin_lock(&hose_spinlock);
 +      list_for_each_entry(hose, &hose_list, list_node) {
 +#ifdef CONFIG_PPC64
 +              size = hose->pci_io_size;
 +#else
 +              size = hose->io_resource.end - hose->io_resource.start + 1;
 +#endif
 +              if (address >= hose->io_base_virt &&
 +                  address < (hose->io_base_virt + size)) {
 +                      ret = 1;
 +                      break;
 +              }
 +      }
 +      spin_unlock(&hose_spinlock);
 +      return ret;
 +}
 +
  /*
   * Return the domain number for this bus.
   */