From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 20 Oct 2008 19:16:53 +0000 (+0100)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: MMI-PSA29.97-13-9~31140^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b364776ad1208a71f0c53578c84619a395412a8d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/intel-iommu.c
---

b364776ad1208a71f0c53578c84619a395412a8d
diff --cc drivers/pci/intel-iommu.c
index 8b51e10b7783,d315e413fae0..a2692724b68f
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@@ -655,8 -637,9 +637,9 @@@ static int __iommu_flush_iotlb(struct i
  		printk(KERN_ERR"IOMMU: flush IOTLB failed\n");
  	if (DMA_TLB_IAIG(val) != DMA_TLB_IIRG(type))
  		pr_debug("IOMMU: tlb flush request %Lx, actual %Lx\n",
- 			DMA_TLB_IIRG(type), DMA_TLB_IAIG(val));
+ 			(unsigned long long)DMA_TLB_IIRG(type),
+ 			(unsigned long long)DMA_TLB_IAIG(val));
 -	/* flush context entry will implictly flush write buffer */
 +	/* flush iotlb entry will implicitly flush write buffer */
  	return 0;
  }