diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-11-10 05:46:14 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-10 06:31:23 -0500 |
commit | de957628ce7c84764ff41331111036b3ae5bad0f (patch) | |
tree | d13dcb1c152e738e079a03fc3bb0b87d1a4d3dab /arch/x86/kernel/pci-dma.c | |
parent | d7b9f7be216b04ff9d108f856bc03d96e7b3439c (diff) |
x86: GART: Convert gart_iommu_hole_init() to use iommu_init hook
This changes gart_iommu_hole_init() to set gart_iommu_init() to
iommu_init hook if gart_iommu_hole_init() finds the GART IOMMU.
We can kill the code to check if we found the IOMMU in
gart_iommu_init() since gart_iommu_hole_init() sets
gart_iommu_init() only when it found the IOMMU.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: chrisw@sous-sol.org
Cc: dwmw2@infradead.org
Cc: joerg.roedel@amd.com
Cc: muli@il.ibm.com
LKML-Reference: <1257849980-22640-4-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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 0224da88256a..ecde8543537f 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
@@ -298,8 +298,6 @@ static int __init pci_iommu_init(void) | |||
298 | 298 | ||
299 | amd_iommu_init(); | 299 | amd_iommu_init(); |
300 | 300 | ||
301 | gart_iommu_init(); | ||
302 | |||
303 | no_iommu_init(); | 301 | no_iommu_init(); |
304 | return 0; | 302 | return 0; |
305 | } | 303 | } |