From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 May 2010 00:25:01 +0000 (-0700)
Subject: Merge git://git.infradead.org/iommu-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0961d6581c870850342ad6ea25263763433d666f;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Set a more specific taint flag for invalid BIOS DMAR tables
  intel-iommu: Combine the BIOS DMAR table warning messages
  panic: Add taint flag TAINT_FIRMWARE_WORKAROUND ('I')
  panic: Allow warnings to set different taint flags
  intel-iommu: intel_iommu_map_range failed at very end of address space
  intel-iommu: errors with smaller iommu widths
  intel-iommu: Fix boot inside 64bit virtualbox with io-apic disabled
  intel-iommu: use physfn to search drhd for VF
  intel-iommu: Print out iommu seq_id
  intel-iommu: Don't complain that ACPI_DMAR_SCOPE_TYPE_IOAPIC is not supported
  intel-iommu: Avoid global flushes with caching mode.
  intel-iommu: Use correct domain ID when caching mode is enabled
  intel-iommu mistakenly uses offset_pfn when caching mode is enabled
  intel-iommu: use for_each_set_bit()
  intel-iommu: Fix section mismatch dmar_ir_support() uses dmar_tbl.
---

0961d6581c870850342ad6ea25263763433d666f
diff --cc drivers/pci/intel-iommu.c
index 371dc564e2e4,65741dc491d6..796828fce34c
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@@ -3632,9 -3626,7 +3626,8 @@@ static int intel_iommu_map(struct iommu
  {
  	struct dmar_domain *dmar_domain = domain->priv;
  	u64 max_addr;
- 	int addr_width;
  	int prot = 0;
 +	size_t size;
  	int ret;
  
  	if (iommu_prot & IOMMU_READ)
@@@ -3644,10 -3636,8 +3637,9 @@@
  	if ((iommu_prot & IOMMU_CACHE) && dmar_domain->iommu_snooping)
  		prot |= DMA_PTE_SNP;
  
 +	size     = PAGE_SIZE << gfp_order;
  	max_addr = iova + size;
  	if (dmar_domain->max_addr < max_addr) {
- 		int min_agaw;
  		u64 end;
  
  		/* check if minimum agaw is sufficient for mapped address */