• Linus Torvalds's avatar
    Merge branch 'x86-iommu-for-linus' of... · 157b6ceb
    Linus Torvalds authored
    Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, iommu: Update header comments with appropriate naming
      ia64, iommu: Add a dummy iommu_table.h file in IA64.
      x86, iommu: Fix IOMMU_INIT alignment rules
      x86, doc: Adding comments about .iommu_table and its neighbors.
      x86, iommu: Utilize the IOMMU_INIT macros functionality.
      x86, VT-d: Make Intel VT-d IOMMU use IOMMU_INIT_* macros.
      x86, GART/AMD-VI: Make AMD GART and IOMMU use IOMMU_INIT_* macros.
      x86, calgary: Make Calgary IOMMU use IOMMU_INIT_* macros.
      x86, xen-swiotlb: Make Xen-SWIOTLB use IOMMU_INIT_* macros.
      x86, swiotlb: Make SWIOTLB use IOMMU_INIT_* macros.
      x86, swiotlb: Simplify SWIOTLB pci_swiotlb_detect routine.
      x86, iommu: Add proper dependency sort routine (and sanity check).
      x86, iommu: Make all IOMMU's detection routines return a value.
      x86, iommu: Add IOMMU_INIT macros, .iommu_table section, and iommu_table_entry structure
    157b6ceb
gart.h 2.66 KB