fix fix-intel-iommu-write-buffer-flushing.patch

diff --git a/review-2.6.27/fix-intel-iommu-write-buffer-flushing.patch b/review-2.6.27/fix-intel-iommu-write-buffer-flushing.patch
index cab41a1de2982c7c3de259c0c9952c9a8a91eae5..1470bf2f99a9203bcfbd77894cee59fc5f1b6efa 100644 (file)
--- a/review-2.6.27/fix-intel-iommu-write-buffer-flushing.patch
+++ b/review-2.6.27/fix-intel-iommu-write-buffer-flushing.patch
@@ -30,7 +30,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/drivers/pci/intel-iommu.c
 +++ b/drivers/pci/intel-iommu.c
-@@ -527,7 +527,7 @@ static void iommu_flush_write_buffer(str
+@@ -72,6 +72,8 @@ static struct deferred_flush_tables *def
+ /* bitmap for indexing intel_iommus */
+ static int g_num_of_iommus;
+ 
++static int rwbf_quirk = 0;
++
+ static DEFINE_SPINLOCK(async_umap_flush_lock);
+ static LIST_HEAD(unmaps_to_do);
+ 
+@@ -527,7 +529,7 @@ static void iommu_flush_write_buffer(str
        u32 val;
        unsigned long flag;
  
@@ -39,15 +48,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                return;
        val = iommu->gcmd | DMA_GCMD_WBF;
  
-@@ -1410,6 +1410,8 @@ static void domain_remove_dev_info(struc
-       spin_unlock_irqrestore(&device_domain_lock, flags);
- }
- 
-+static int rwbf_quirk = 0;
-+
- /*
-  * find_domain
-  * Note: we use struct pci_dev->dev.archdata.iommu stores the info
 @@ -2453,3 +2455,12 @@ int __init intel_iommu_init(void)
        return 0;
  }

diff --git a/review-2.6.28/fix-intel-iommu-write-buffer-flushing.patch b/review-2.6.28/fix-intel-iommu-write-buffer-flushing.patch
index f1f4701264b3623e3c8c918a4c4437bd7d113414..4cd6ac57284fede5f8302a2468d920f50a50f1eb 100644 (file)
--- a/review-2.6.28/fix-intel-iommu-write-buffer-flushing.patch
+++ b/review-2.6.28/fix-intel-iommu-write-buffer-flushing.patch
@@ -30,7 +30,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/drivers/pci/intel-iommu.c
 +++ b/drivers/pci/intel-iommu.c
-@@ -506,7 +506,7 @@ static void iommu_flush_write_buffer(str
+@@ -71,6 +71,8 @@ static struct deferred_flush_tables *def
+ /* bitmap for indexing intel_iommus */
+ static int g_num_of_iommus;
+ 
++static int rwbf_quirk = 0;
++
+ static DEFINE_SPINLOCK(async_umap_flush_lock);
+ static LIST_HEAD(unmaps_to_do);
+ 
+@@ -506,7 +508,7 @@ static void iommu_flush_write_buffer(str
        u32 val;
        unsigned long flag;
  
@@ -39,15 +48,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                return;
        val = iommu->gcmd | DMA_GCMD_WBF;
  
-@@ -1315,6 +1315,8 @@ static void domain_remove_dev_info(struc
-       spin_unlock_irqrestore(&device_domain_lock, flags);
- }
- 
-+static int rwbf_quirk = 0;
-+
- /*
-  * find_domain
-  * Note: we use struct pci_dev->dev.archdata.iommu stores the info
 @@ -2436,3 +2438,13 @@ u64 intel_iommu_iova_to_pfn(struct dmar_
        return pfn >> VTD_PAGE_SHIFT;
  }