Hi David, Ingo,
Today's linux-next merge of the dwmw2-iommu tree got a conflict in
drivers/pci/intel-iommu.c between commits
160c1d8e40866edfeae7d68816b7005d70acf391 ("x86, ia64: convert to use
generic dma_map_ops struct") and d7ab5c46ae2743079a40bb4060e510418c0842b4
("intel-iommu: make dma mapping functions static") from the iommu tree
and commit 4cf2e75d0bec15d945972b005056c4a8731b82cf ("intel-iommu: Enable
DMAR on 32-bit kernel") from the dwmw2-iommu tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/pci/intel-iommu.c
index 9dbd506,002c8b9..0000000
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@@ -2282,11 -2471,8 +2320,9 @@@ static void intel_free_coherent(struct
free_pages((unsigned long)vaddr, order);
}
- #define SG_ENT_VIRT_ADDRESS(sg) (sg_virt((sg)))
-
-void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
- int nelems, int dir)
+static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
+ int nelems, enum dma_data_direction dir,
+ struct dma_attrs *attrs)
{
int i;
struct pci_dev *pdev = to_pci_dev(hwdev);
@@@ -2343,10 -2529,10 +2379,10 @@@ static int intel_nontranslate_map_sg(st
return nelems;
}
-int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
- int dir)
+static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
+ enum dma_data_direction dir, struct dma_attrs *attrs)
{
- void *addr;
+ phys_addr_t addr;
int i;
struct pci_dev *pdev = to_pci_dev(hwdev);
struct dmar_domain *domain;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
