From a7ca070db52f413b736e85f33b46143567ffb07a Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joro@8bytes.org>
Date: Wed, 6 Feb 2013 12:55:23 +0100
Subject: [PATCH] --- yaml --- r: 358846 b: refs/heads/master c:
 f528d980c17b8714aedc918ba86e058af914d66b h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/iommu/amd_iommu_init.c | 10 +++++-----
 trunk/drivers/iommu/dmar.c           |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index df076ca1f824..43f76b145338 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37a407101e08e444a193837a1e1d4f6f66c8dad4
+refs/heads/master: f528d980c17b8714aedc918ba86e058af914d66b
diff --git a/trunk/drivers/iommu/amd_iommu_init.c b/trunk/drivers/iommu/amd_iommu_init.c
index faf10ba1ed9a..b6ecddb63cd0 100644
--- a/trunk/drivers/iommu/amd_iommu_init.c
+++ b/trunk/drivers/iommu/amd_iommu_init.c
@@ -1876,11 +1876,6 @@ static int amd_iommu_init_dma(void)
 	struct amd_iommu *iommu;
 	int ret;
 
-	init_device_table_dma();
-
-	for_each_iommu(iommu)
-		iommu_flush_all_caches(iommu);
-
 	if (iommu_pass_through)
 		ret = amd_iommu_init_passthrough();
 	else
@@ -1889,6 +1884,11 @@ static int amd_iommu_init_dma(void)
 	if (ret)
 		return ret;
 
+	init_device_table_dma();
+
+	for_each_iommu(iommu)
+		iommu_flush_all_caches(iommu);
+
 	amd_iommu_init_api();
 
 	amd_iommu_init_notifier();
diff --git a/trunk/drivers/iommu/dmar.c b/trunk/drivers/iommu/dmar.c
index 2623a570ad2f..86e2f4a62b9a 100644
--- a/trunk/drivers/iommu/dmar.c
+++ b/trunk/drivers/iommu/dmar.c
@@ -1040,7 +1040,7 @@ int dmar_enable_qi(struct intel_iommu *iommu)
 
 	qi->desc = page_address(desc_page);
 
-	qi->desc_status = kzalloc(QI_LENGTH * sizeof(int), GFP_ATOMIC);
+	qi->desc_status = kmalloc(QI_LENGTH * sizeof(int), GFP_ATOMIC);
 	if (!qi->desc_status) {
 		free_page((unsigned long) qi->desc);
 		kfree(qi);