summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-dma.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2009-11-10 19:46:13 +0900
committerIngo Molnar <mingo@elte.hu>2009-11-10 12:31:15 +0100
commitd7b9f7be216b04ff9d108f856bc03d96e7b3439c (patch)
tree8ee21e81501bbba10bead150235ca811bf81a6bb /arch/x86/kernel/pci-dma.c
parentd07c1be0693e0902d743160b8b638585b808f8ac (diff)
downloadop-kernel-dev-d7b9f7be216b04ff9d108f856bc03d96e7b3439c.zip
op-kernel-dev-d7b9f7be216b04ff9d108f856bc03d96e7b3439c.tar.gz
x86: Calgary: Convert detect_calgary() to use iommu_init hook
This changes detect_calgary() to set init_calgary() to iommu_init hook if detect_calgary() finds the Calgary IOMMU. We can kill the code to check if we found the IOMMU in init_calgary() since detect_calgary() sets init_calgary() only when it found the IOMMU. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Muli Ben-Yehuda <muli@il.ibm.com> Cc: chrisw@sous-sol.org Cc: dwmw2@infradead.org Cc: joerg.roedel@amd.com LKML-Reference: <1257849980-22640-3-git-send-email-fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
-rw-r--r--arch/x86/kernel/pci-dma.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index a13478d..0224da8 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -294,8 +294,6 @@ static int __init pci_iommu_init(void)
x86_init.iommu.iommu_init();
- calgary_iommu_init();
-
intel_iommu_init();
amd_iommu_init();
OpenPOWER on IntegriCloud