From: David Woodhouse <David.Woodhouse@intel.com>
Date: Tue, 21 Oct 2008 18:42:20 +0000 (+0100)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.28-rc1~39^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b876d08f816527af257e13d89fb0d3b4b849223c;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c
---

b876d08f816527af257e13d89fb0d3b4b849223c
diff --cc drivers/pci/dmar.c
index 7b3751136e6,8b29c307f1a..691b3adeb87
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -453,10 -458,10 +458,10 @@@ void __init detect_intel_iommu(void
  {
  	int ret;
  
- 	ret = early_dmar_detect();
+ 	ret = dmar_table_detect();
  
 -#ifdef CONFIG_DMAR
  	{
 +#ifdef CONFIG_INTR_REMAP
  		struct acpi_table_dmar *dmar;
  		/*
  		 * for now we will disable dma-remapping when interrupt
@@@ -469,14 -474,26 +474,14 @@@
  			printk(KERN_INFO
  			       "Queued invalidation will be enabled to support "
  			       "x2apic and Intr-remapping.\n");
 -			printk(KERN_INFO
 -			       "Disabling IOMMU detection, because of missing "
 -			       "queued invalidation support for IOTLB "
 -			       "invalidation\n");
 -			printk(KERN_INFO
 -			       "Use \"nox2apic\", if you want to use Intel "
 -			       " IOMMU for DMA-remapping and don't care about "
 -			       " x2apic support\n");
 -
 -			dmar_disabled = 1;
 -			goto end;
 -		}
 -
 +#endif
- 
 +#ifdef CONFIG_DMAR
  		if (ret && !no_iommu && !iommu_detected && !swiotlb &&
  		    !dmar_disabled)
  			iommu_detected = 1;
 -	}
 -end:
  #endif
 +	}
+ 	dmar_tbl = NULL;
  }