• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 0cfdc724
    Linus Torvalds authored
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (33 commits)
      iommu/core: Remove global iommu_ops and register_iommu
      iommu/msm: Use bus_set_iommu instead of register_iommu
      iommu/omap: Use bus_set_iommu instead of register_iommu
      iommu/vt-d: Use bus_set_iommu instead of register_iommu
      iommu/amd: Use bus_set_iommu instead of register_iommu
      iommu/core: Use bus->iommu_ops in the iommu-api
      iommu/core: Convert iommu_found to iommu_present
      iommu/core: Add bus_type parameter to iommu_domain_alloc
      Driver core: Add iommu_ops to bus_type
      iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_API
      iommu/amd: Fix wrong shift direction
      iommu/omap: always provide iommu debug code
      iommu/core: let drivers know if an iommu fault handler isn't installed
      iommu/core: export iommu_set_fault_handler()
      iommu/omap: Fix build error with !IOMMU_SUPPORT
      iommu/omap: Migrate to the generic fault report mechanism
      iommu/core: Add fault reporting mechanism
      iommu/core: Use PAGE_SIZE instead of hard-coded value
      iommu/core: use the existing IS_ALIGNED macro
      iommu/msm: ->unmap() should return order of unmapped page
      ...
    
    Fixup trivial conflicts in drivers/iommu/Makefile: "move omap iommu to
    dedicated iommu folder" vs "Rename the DMAR and INTR_REMAP config
    options" just happened to touch lines next to each other.
    0cfdc724
x86.c 170 KB