Skip to content

Commit

Permalink
x86: remove ifdef CONFIG_CALGARY_IOMMU in pci-dma.c
Browse files Browse the repository at this point in the history
asm-x86/calgary.h has dummy calgary_iommu_init() and detect_calgary()
in !CONFIG_CALGARY_IOMMU case. So we don't need ifdef
CONFIG_CALGARY_IOMMU in pci-dma.c.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Alexis Bruemmer <alexisb@us.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
FUJITA Tomonori authored and Ingo Molnar committed Jul 11, 2008
1 parent ac7ded2 commit b8b4832
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions arch/x86/kernel/pci-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@ void __init pci_iommu_alloc(void)
*/
gart_iommu_hole_init();

#ifdef CONFIG_CALGARY_IOMMU
detect_calgary();
#endif

detect_intel_iommu();

Expand Down Expand Up @@ -496,9 +494,7 @@ EXPORT_SYMBOL(dma_free_coherent);

static int __init pci_iommu_init(void)
{
#ifdef CONFIG_CALGARY_IOMMU
calgary_iommu_init();
#endif

intel_iommu_init();

Expand Down

0 comments on commit b8b4832

Please sign in to comment.