From ee9ab3e6b0a6378df24dce794ef0b28ffcaf6f78 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 26 Aug 2012 09:51:15 +0800
Subject: [PATCH] --- yaml --- r: 331516 b: refs/heads/master c:
 2166f0eefc435b1e99d1b179e1294ee2bf7f7bd9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e5b0e484a2a0..cd626f7ec122 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8ffcc9279f90ba3790c6dc0f01207ad6ea1c8df
+refs/heads/master: 2166f0eefc435b1e99d1b179e1294ee2bf7f7bd9
diff --git a/trunk/drivers/iommu/amd_iommu_init.c b/trunk/drivers/iommu/amd_iommu_init.c
index 18a89b760aaa..860c1c342cd9 100644
--- a/trunk/drivers/iommu/amd_iommu_init.c
+++ b/trunk/drivers/iommu/amd_iommu_init.c
@@ -26,7 +26,6 @@
 #include <linux/msi.h>
 #include <linux/amd-iommu.h>
 #include <linux/export.h>
-#include <linux/acpi.h>
 #include <acpi/acpi.h>
 #include <asm/pci-direct.h>
 #include <asm/iommu.h>
diff --git a/trunk/drivers/iommu/exynos-iommu.c b/trunk/drivers/iommu/exynos-iommu.c
index 7fe44f83cc37..80bad32aa463 100644
--- a/trunk/drivers/iommu/exynos-iommu.c
+++ b/trunk/drivers/iommu/exynos-iommu.c
@@ -840,7 +840,8 @@ static void exynos_iommu_detach_device(struct iommu_domain *domain,
 	if (__exynos_sysmmu_disable(data)) {
 		dev_dbg(dev, "%s: Detached IOMMU with pgtable %#lx\n",
 					__func__, __pa(priv->pgtable));
-		list_del_init(&data->node);
+		list_del(&data->node);
+		INIT_LIST_HEAD(&data->node);
 
 	} else {
 		dev_dbg(dev, "%s: Detaching IOMMU with pgtable %#lx delayed",