From dcfb63ead0807dc7005c8fb2112cb141c1166722 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 3 Jul 2008 19:35:09 +0200
Subject: [PATCH] --- yaml --- r: 99641 b: refs/heads/master c:
 8b14518fadd9d5915827d86d5c10e602fedf042e h: refs/heads/master i:   99639:
 c65de308c7a5c50c17a4e3826704e739d0454dc5 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/amd_iommu_init.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 280ec53dd232..7c4c7311a82a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 999ba417cc1a43881126d08876d5d7e653113ae3
+refs/heads/master: 8b14518fadd9d5915827d86d5c10e602fedf042e
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
index 5d9e45c7cea2..c54c82305af4 100644
--- a/trunk/arch/x86/kernel/amd_iommu_init.c
+++ b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -101,8 +101,6 @@ struct ivmd_header {
 	u64 range_length;
 } __attribute__((packed));
 
-static int __initdata amd_iommu_disable;
-
 u16 amd_iommu_last_bdf;
 struct list_head amd_iommu_unity_map;
 unsigned amd_iommu_aperture_order = 26;
@@ -686,7 +684,7 @@ int __init amd_iommu_init(void)
 	int i, ret = 0;
 
 
-	if (amd_iommu_disable) {
+	if (no_iommu) {
 		printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n");
 		return 0;
 	}
@@ -831,9 +829,6 @@ void __init amd_iommu_detect(void)
 	if (swiotlb || no_iommu || iommu_detected)
 		return;
 
-	if (amd_iommu_disable)
-		return;
-
 	if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
 		iommu_detected = 1;
 #ifdef CONFIG_GART_IOMMU
@@ -846,8 +841,6 @@ void __init amd_iommu_detect(void)
 static int __init parse_amd_iommu_options(char *str)
 {
 	for (; *str; ++str) {
-		if (strcmp(str, "off") == 0)
-			amd_iommu_disable = 1;
 		if (strcmp(str, "isolate") == 0)
 			amd_iommu_isolate = 1;
 	}