From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Jan 2009 20:03:52 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux... 
X-Git-Tag: v2.6.29-rc1~522
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=269b012321f2f1f8e4648c43a93bf432b42c6668;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu: (89 commits)
  AMD IOMMU: remove now unnecessary #ifdefs
  AMD IOMMU: prealloc_protection_domains should be static
  kvm/iommu: fix compile warning
  AMD IOMMU: add statistics about total number of map requests
  AMD IOMMU: add statistics about allocated io memory
  AMD IOMMU: add stats counter for domain tlb flushes
  AMD IOMMU: add stats counter for single iommu domain tlb flushes
  AMD IOMMU: add stats counter for cross-page request
  AMD IOMMU: add stats counter for free_coherent requests
  AMD IOMMU: add stats counter for alloc_coherent requests
  AMD IOMMU: add stats counter for unmap_sg requests
  AMD IOMMU: add stats counter for map_sg requests
  AMD IOMMU: add stats counter for unmap_single requests
  AMD IOMMU: add stats counter for map_single requests
  AMD IOMMU: add stats counter for completion wait events
  AMD IOMMU: add init code for statistic collection
  AMD IOMMU: add necessary header defines for stats counting
  AMD IOMMU: add Kconfig entry for statistic collection code
  AMD IOMMU: use dev_name in iommu_enable function
  AMD IOMMU: use calc_devid in prealloc_protection_domains
  ...
---

269b012321f2f1f8e4648c43a93bf432b42c6668
diff --cc arch/x86/kernel/amd_iommu_init.c
index fb85e8d466c,be81f6125c5..42c33cebf00
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@@ -243,14 -244,10 +244,10 @@@ static void __init iommu_feature_disabl
  }
  
  /* Function to enable the hardware */
 -void __init iommu_enable(struct amd_iommu *iommu)
 +static void __init iommu_enable(struct amd_iommu *iommu)
  {
- 	printk(KERN_INFO "AMD IOMMU: Enabling IOMMU "
- 	       "at %02x:%02x.%x cap 0x%hx\n",
- 	       iommu->dev->bus->number,
- 	       PCI_SLOT(iommu->dev->devfn),
- 	       PCI_FUNC(iommu->dev->devfn),
- 	       iommu->cap_ptr);
+ 	printk(KERN_INFO "AMD IOMMU: Enabling IOMMU at %s cap 0x%hx\n",
+ 	       dev_name(&iommu->dev->dev), iommu->cap_ptr);
  
  	iommu_feature_enable(iommu, CONTROL_IOMMU_EN);
  }