From b06db5595c770ef30103b7d4a99459a97a85350d Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 2 Dec 2008 18:20:21 +0100
Subject: [PATCH] --- yaml --- r: 125599 b: refs/heads/master c:
 86db2e5d47bfa61a151d6ac83263f4bde4d52290 h: refs/heads/master i:   125597:
 0ecdcad0c58b67ee613ed016fc0f358c95c4f3cb   125595:
 1c0d608e049099693a0f4594fd9929c5f3064374   125591:
 3ee69d0a3d22d92ace342293f7995e6d6d547083   125583:
 396b6d7e0ef0132843e7f8450de3b269cea831f3   125567:
 01a407c11eefd5f691d84cdce6780a96a959736e v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/amd_iommu.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6b7cf2e45cf3..8eb37846890f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38e817febe2f12bd2fbf92a1df36f41946d0c223
+refs/heads/master: 86db2e5d47bfa61a151d6ac83263f4bde4d52290
diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c
index b11c855af7b4..8a0fd3d09973 100644
--- a/trunk/arch/x86/kernel/amd_iommu.c
+++ b/trunk/arch/x86/kernel/amd_iommu.c
@@ -587,12 +587,12 @@ static void dma_ops_reserve_addresses(struct dma_ops_domain *dom,
 	iommu_area_reserve(dom->bitmap, start_page, pages);
 }
 
-static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom)
+static void free_pagetable(struct protection_domain *domain)
 {
 	int i, j;
 	u64 *p1, *p2, *p3;
 
-	p1 = dma_dom->domain.pt_root;
+	p1 = domain->pt_root;
 
 	if (!p1)
 		return;
@@ -613,6 +613,8 @@ static void dma_ops_free_pagetable(struct dma_ops_domain *dma_dom)
 	}
 
 	free_page((unsigned long)p1);
+
+	domain->pt_root = NULL;
 }
 
 /*
@@ -624,7 +626,7 @@ static void dma_ops_domain_free(struct dma_ops_domain *dom)
 	if (!dom)
 		return;
 
-	dma_ops_free_pagetable(dom);
+	free_pagetable(&dom->domain);
 
 	kfree(dom->pte_pages);