-
- Downloads
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus-phase3-B
Conflicts: arch/x86/kernel/pci-gart_64.c include/asm-x86/dma-mapping.h
Showing
- Documentation/kernel-parameters.txt 5 additions, 0 deletionsDocumentation/kernel-parameters.txt
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- arch/ia64/include/asm/dma-mapping.h 3 additions, 1 deletionarch/ia64/include/asm/dma-mapping.h
- arch/x86/Kconfig 1 addition, 0 deletionsarch/x86/Kconfig
- arch/x86/kernel/amd_iommu.c 267 additions, 61 deletionsarch/x86/kernel/amd_iommu.c
- arch/x86/kernel/amd_iommu_init.c 176 additions, 18 deletionsarch/x86/kernel/amd_iommu_init.c
- arch/x86/kernel/early-quirks.c 18 additions, 0 deletionsarch/x86/kernel/early-quirks.c
- arch/x86/kernel/k8.c 3 additions, 2 deletionsarch/x86/kernel/k8.c
- arch/x86/kernel/pci-calgary_64.c 17 additions, 1 deletionarch/x86/kernel/pci-calgary_64.c
- arch/x86/kernel/pci-dma.c 34 additions, 143 deletionsarch/x86/kernel/pci-dma.c
- arch/x86/kernel/pci-gart_64.c 67 additions, 58 deletionsarch/x86/kernel/pci-gart_64.c
- arch/x86/kernel/pci-nommu.c 9 additions, 1 deletionarch/x86/kernel/pci-nommu.c
- drivers/pci/intel-iommu.c 1 addition, 1 deletiondrivers/pci/intel-iommu.c
- include/asm-x86/amd_iommu.h 3 additions, 0 deletionsinclude/asm-x86/amd_iommu.h
- include/asm-x86/amd_iommu_types.h 62 additions, 2 deletionsinclude/asm-x86/amd_iommu_types.h
- include/asm-x86/bitops.h 0 additions, 10 deletionsinclude/asm-x86/bitops.h
- include/asm-x86/dma-mapping.h 71 additions, 16 deletionsinclude/asm-x86/dma-mapping.h
- include/asm-x86/gart.h 2 additions, 0 deletionsinclude/asm-x86/gart.h
- include/asm-x86/iommu.h 1 addition, 0 deletionsinclude/asm-x86/iommu.h
- include/linux/dma-mapping.h 12 additions, 0 deletionsinclude/linux/dma-mapping.h
Loading
Please register or sign in to comment