[PATCH] powerpc: merge the rest of the vio code

[linux-beck.git] / arch / powerpc / platforms / iseries / pci.c

diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 4b75131773a698eef0ec7ff1ab38e5b3b9331b97..428ffb5cf044feb97c2c98149d7e048fa883af42 100644 (file)
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -37,6 +37,7 @@
 
 #include <asm/iseries/hv_call_xm.h>
 #include <asm/iseries/mf.h>
+#include <asm/iseries/iommu.h>
 
 #include <asm/ppc-pci.h>
 
@@ -44,8 +45,6 @@
 #include "pci.h"
 #include "call_pci.h"
 
-extern unsigned long io_page_mask;
-
 /*
  * Forward declares of prototypes.
  */
@@ -244,10 +243,9 @@ unsigned long __init find_and_init_phbs(void)
                if (ret == 0) {
                        printk("bus %d appears to exist\n", bus);
 
-                       phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
+                       phb = pcibios_alloc_controller(NULL);
                        if (phb == NULL)
                                return -ENOMEM;
-                       pci_setup_pci_controller(phb);
 
                        phb->pci_mem_offset = phb->local_number = bus;
                        phb->first_busno = bus;
@@ -277,7 +275,6 @@ void iSeries_pcibios_init(void)
 {
        iomm_table_initialize();
        find_and_init_phbs();
-       io_page_mask = -1;
 }
 
 /*