Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 9 insertions, 25 deletions

diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 572b7846cc77..1488535b0e13 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -48,9 +48,6 @@
 
 #include "dart.h"
 
-extern int iommu_is_off;
-extern int iommu_force_on;
-
 /* Physical base address and size of the DART table */
 unsigned long dart_tablebase; /* exported to htab_initialize */
 static unsigned long dart_tablesize;
@@ -289,24 +286,15 @@ static void iommu_table_dart_setup(void)
         set_bit(iommu_table_dart.it_size - 1, iommu_table_dart.it_map);
 }
 
-static void iommu_dev_setup_dart(struct pci_dev *dev)
+static void pci_dma_dev_setup_dart(struct pci_dev *dev)
 {
-        struct device_node *dn;
-
         /* We only have one iommu table on the mac for now, which makes
          * things simple. Setup all PCI devices to point to this table
-         *
-         * We must use pci_device_to_OF_node() to make sure that
-         * we get the real "final" pointer to the device in the
-         * pci_dev sysdata and not the temporary PHB one
          */
-        dn = pci_device_to_OF_node(dev);
-
-        if (dn)
-                PCI_DN(dn)->iommu_table = &iommu_table_dart;
+        dev->dev.archdata.dma_data = &iommu_table_dart;
 }
 
-static void iommu_bus_setup_dart(struct pci_bus *bus)
+static void pci_dma_bus_setup_dart(struct pci_bus *bus)
 {
         struct device_node *dn;
 
@@ -321,9 +309,6 @@ static void iommu_bus_setup_dart(struct pci_bus *bus)
                 PCI_DN(dn)->iommu_table = &iommu_table_dart;
 }
 
-static void iommu_dev_setup_null(struct pci_dev *dev) { }
-static void iommu_bus_setup_null(struct pci_bus *bus) { }
-
 void iommu_init_early_dart(void)
 {
         struct device_node *dn;
@@ -344,22 +329,21 @@ void iommu_init_early_dart(void)
 
         /* Initialize the DART HW */
         if (dart_init(dn) == 0) {
-                ppc_md.iommu_dev_setup = iommu_dev_setup_dart;
-                ppc_md.iommu_bus_setup = iommu_bus_setup_dart;
+                ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_dart;
+                ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
 
                 /* Setup pci_dma ops */
-                pci_iommu_init();
-
+                pci_dma_ops = &dma_iommu_ops;
                 return;
         }
 
  bail:
         /* If init failed, use direct iommu and null setup functions */
-        ppc_md.iommu_dev_setup = iommu_dev_setup_null;
-        ppc_md.iommu_bus_setup = iommu_bus_setup_null;
+        ppc_md.pci_dma_dev_setup = NULL;
+        ppc_md.pci_dma_bus_setup = NULL;
 
         /* Setup pci_dma ops */
-        pci_direct_iommu_init();
+        pci_dma_ops = &dma_direct_ops;
 }