x86, VT-d: Make Intel VT-d IOMMU use IOMMU_INIT_* macros.
We utilize the IOMMU_INIT macros to create this dependency: [null] | [pci_xen_swiotlb_detect] | [pci_swiotlb_detect_override] | [pci_swiotlb_detect_4gb] | +-------+--------+---------------------+ / \ \ [detect_calgary] [gart_iommu_hole_init] [detect_intel_iommu] | [amd_iommu_detect] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> LKML-Reference: <1282845485-8991-10-git-send-email-konrad.wilk@oracle.com> CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp> CC: Jesse Barnes <jbarnes@virtuousgeek.org> CC: David Woodhouse <David.Woodhouse@intel.com> CC: Len Brown <len.brown@intel.com> CC: Chris Wright <chrisw@sous-sol.org> CC: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
parent
22e6daf41b
commit
4db77ff323
|
@ -36,6 +36,7 @@
|
|||
#include <linux/tboot.h>
|
||||
#include <linux/dmi.h>
|
||||
#include <linux/slab.h>
|
||||
#include <asm/iommu_table.h>
|
||||
|
||||
#define PREFIX "DMAR: "
|
||||
|
||||
|
@ -724,7 +725,7 @@ int __init detect_intel_iommu(void)
|
|||
early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
|
||||
dmar_tbl = NULL;
|
||||
|
||||
return (ret ? 1 : -ENODEV);
|
||||
return ret ? 1 : -ENODEV;
|
||||
}
|
||||
|
||||
|
||||
|
@ -1457,3 +1458,4 @@ int __init dmar_ir_support(void)
|
|||
return 0;
|
||||
return dmar->flags & 0x1;
|
||||
}
|
||||
IOMMU_INIT_POST(detect_intel_iommu);
|
||||
|
|
Loading…
Reference in a new issue