Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6: drivers/pci/intr_remapping.c: include acpi.h intel-iommu: Fix oops in device_to_iommu() when devices not found. intel-iommu: Handle PCI domains appropriately. intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges. x2apic/intr-remap: decouple interrupt remapping from x2apic x86, dmar: check if it's initialized before disable queue invalidation intel-iommu: set compatibility format interrupt Intel IOMMU Suspend/Resume Support - Interrupt Remapping Intel IOMMU Suspend/Resume Support - Queued Invalidation Intel IOMMU Suspend/Resume Support - DMAR intel-iommu: Add for_each_iommu() and for_each_active_iommu() macros
Showing
- arch/x86/Kconfig 1 addition, 1 deletionarch/x86/Kconfig
- arch/x86/include/asm/apic.h 3 additions, 0 deletionsarch/x86/include/asm/apic.h
- arch/x86/include/asm/io_apic.h 7 additions, 4 deletionsarch/x86/include/asm/io_apic.h
- arch/x86/kernel/apic/apic.c 62 additions, 8 deletionsarch/x86/kernel/apic/apic.c
- arch/x86/kernel/apic/io_apic.c 94 additions, 46 deletionsarch/x86/kernel/apic/io_apic.c
- drivers/pci/dmar.c 56 additions, 15 deletionsdrivers/pci/dmar.c
- drivers/pci/intel-iommu.c 210 additions, 29 deletionsdrivers/pci/intel-iommu.c
- drivers/pci/intr_remapping.c 82 additions, 2 deletionsdrivers/pci/intr_remapping.c
- include/linux/dmar.h 11 additions, 0 deletionsinclude/linux/dmar.h
- include/linux/intel-iommu.h 13 additions, 0 deletionsinclude/linux/intel-iommu.h
Loading
Please register or sign in to comment