From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2009 17:36:57 +0000 (-0700)
Subject: Merge git://git.infradead.org/iommu-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ca1ee219c070eab755712d50638bbcd1f8630fc1;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Fix address wrap on 32-bit kernel.
  intel-iommu: Enable DMAR on 32-bit kernel.
  intel-iommu: fix PCI device detach from virtual machine
  intel-iommu: VT-d page table to support snooping control bit
  iommu: Add domain_has_cap iommu_ops
  intel-iommu: Snooping control support

Fixed trivial conflicts in arch/x86/Kconfig and drivers/pci/intel-iommu.c
---

ca1ee219c070eab755712d50638bbcd1f8630fc1
diff --cc drivers/pci/intel-iommu.c
index 9dbd5066acaf,002c8b95edf8..23e56a564e05
--- 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;