diff options
author | Alexandre Oliva <lxoliva@fsfla.org> | 2011-07-31 13:52:23 +0000 |
---|---|---|
committer | Alexandre Oliva <lxoliva@fsfla.org> | 2011-07-31 13:52:23 +0000 |
commit | b2a8d19ddd7c98755a003692b8d44c05024ed148 (patch) | |
tree | f6e5d08a7547b37694aa6f76d560767417d1999b /freed-ora/current/f15/intel-iommu-use-coherent-dma-mask-when-requested.patch | |
parent | 09cab5f976d9de1ac3a8551ac7341e1d8cc0a214 (diff) | |
download | linux-libre-raptor-b2a8d19ddd7c98755a003692b8d44c05024ed148.tar.gz linux-libre-raptor-b2a8d19ddd7c98755a003692b8d44c05024ed148.zip |
2.6.40-4.fc15
Diffstat (limited to 'freed-ora/current/f15/intel-iommu-use-coherent-dma-mask-when-requested.patch')
-rw-r--r-- | freed-ora/current/f15/intel-iommu-use-coherent-dma-mask-when-requested.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/freed-ora/current/f15/intel-iommu-use-coherent-dma-mask-when-requested.patch b/freed-ora/current/f15/intel-iommu-use-coherent-dma-mask-when-requested.patch deleted file mode 100644 index 01b43db74..000000000 --- a/freed-ora/current/f15/intel-iommu-use-coherent-dma-mask-when-requested.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c681d0ba1252954208220ad32248a3e8e2fc98e4 Mon Sep 17 00:00:00 2001 -From: Mike Travis <travis@sgi.com> -Date: Sat, 28 May 2011 13:15:05 -0500 -Subject: intel-iommu: Use coherent DMA mask when requested - -From: Mike Travis <travis@sgi.com> - -commit c681d0ba1252954208220ad32248a3e8e2fc98e4 upstream. - -The __intel_map_single function is not honoring the passed in DMA mask. -This results in not using the coherent DMA mask when called from -intel_alloc_coherent(). - -Signed-off-by: Mike Travis <travis@sgi.com> -Acked-by: Chris Wright <chrisw@sous-sol.org> -Reviewed-by: Mike Habeck <habeck@sgi.com> -Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/pci/intel-iommu.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/drivers/pci/intel-iommu.c -+++ b/drivers/pci/intel-iommu.c -@@ -2606,8 +2606,7 @@ static dma_addr_t __intel_map_single(str - iommu = domain_get_iommu(domain); - size = aligned_nrpages(paddr, size); - -- iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), -- pdev->dma_mask); -+ iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), dma_mask); - if (!iova) - goto error; - |