Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu · 269b0123
    Linus Torvalds authored
    * '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
      ...
    269b0123