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

diff --cc arch/x86/include/asm/amd_iommu_types.h
Simple merge

diff --cc arch/x86/kernel/amd_iommu.c
index 8c93b7c,12a541d..dc19ed4
--- 1/arch/x86/kernel/amd_iommu.c
--- 2/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 779ace2,f00f489..b4b61d4
--- 1/arch/x86/kernel/amd_iommu_init.c
--- 2/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();
  
 -      printk(KERN_INFO "AMD IOMMU: device isolation ");
+       if (iommu_pass_through)
+               goto out;
+ 
 +      printk(KERN_INFO "AMD-Vi: device isolation ");
        if (amd_iommu_isolate)
                printk("enabled\n");
        else