Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6: Admit to maintaining VT-d, for my sins. dmar: fix uninitialised 'ret' variable in dmar_parse_dev() intel-iommu: use coherent_dma_mask in alloc_coherent amd_iommu: fix nasty bug that caused ILLEGAL_DEVICE_TABLE_ENTRY errors intel-iommu: IA64 support dmar: remove the quirk which disables dma-remapping when intr-remapping enabled dmar: Use queued invalidation interface for IOTLB and context invalidation dmar: context cache and IOTLB invalidation using queued invalidation dmar: use spin_lock_irqsave() in qi_submit_sync()
Showing
- MAINTAINERS 7 additions, 0 deletionsMAINTAINERS
- arch/x86/kernel/amd_iommu_init.c 1 addition, 1 deletionarch/x86/kernel/amd_iommu_init.c
- arch/x86/kernel/pci-dma.c 0 additions, 16 deletionsarch/x86/kernel/pci-dma.c
- drivers/pci/dmar.c 86 additions, 33 deletionsdrivers/pci/dmar.c
- drivers/pci/intel-iommu.c 129 additions, 121 deletionsdrivers/pci/intel-iommu.c
- drivers/pci/quirks.c 14 additions, 0 deletionsdrivers/pci/quirks.c
- include/asm-x86/iommu.h 4 additions, 0 deletionsinclude/asm-x86/iommu.h
- include/linux/dma_remapping.h 13 additions, 14 deletionsinclude/linux/dma_remapping.h
- include/linux/intel-iommu.h 51 additions, 15 deletionsinclude/linux/intel-iommu.h
Loading
Please register or sign in to comment