From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 3 Sep 2009 14:34:23 +0000 (+0200)
Subject: Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=03362a05c55122baff3556109c922285299dfec4;p=linux-beck.git

Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32

Conflicts:
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c
---

03362a05c55122baff3556109c922285299dfec4
diff --cc arch/x86/kernel/amd_iommu.c
index 8c93b7c7735e,12a541deae5e..dc19ed43b54e
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@@ -41,7 -41,15 +41,14 @@@ static DEFINE_RWLOCK(amd_iommu_devtable
  static LIST_HEAD(iommu_pd_list);
  static DEFINE_SPINLOCK(iommu_pd_list_lock);
  
+ /*
+  * Domain for untranslated devices - only allocated
+  * if iommu=pt passed on kernel cmd line.
+  */
+ static struct protection_domain *pt_domain;
+ 
+ #ifdef CONFIG_IOMMU_API
  static struct iommu_ops amd_iommu_ops;
 -#endif
  
  /*
   * general struct to manage commands send to an IOMMU
diff --cc arch/x86/kernel/amd_iommu_init.c
index 779ace292475,f00f489ab150..b4b61d462dcc
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@@ -1258,7 -1251,10 +1261,10 @@@ int __init amd_iommu_init(void
  
  	enable_iommus();
  
+ 	if (iommu_pass_through)
+ 		goto out;
+ 
 -	printk(KERN_INFO "AMD IOMMU: device isolation ");
 +	printk(KERN_INFO "AMD-Vi: device isolation ");
  	if (amd_iommu_isolate)
  		printk("enabled\n");
  	else