diff options
Diffstat (limited to 'arch/ia64/kernel/pci-dma.c')
| -rw-r--r-- | arch/ia64/kernel/pci-dma.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index 10a75b557650..dbdb778efa05 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c | |||
| @@ -12,13 +12,11 @@ | |||
| 12 | #include <asm/machvec.h> | 12 | #include <asm/machvec.h> |
| 13 | #include <linux/dma-mapping.h> | 13 | #include <linux/dma-mapping.h> |
| 14 | 14 | ||
| 15 | #include <asm/machvec.h> | ||
| 16 | #include <asm/system.h> | 15 | #include <asm/system.h> |
| 17 | 16 | ||
| 18 | #ifdef CONFIG_DMAR | 17 | #ifdef CONFIG_DMAR |
| 19 | 18 | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/string.h> | ||
| 22 | 20 | ||
| 23 | #include <asm/page.h> | 21 | #include <asm/page.h> |
| 24 | #include <asm/iommu.h> | 22 | #include <asm/iommu.h> |
| @@ -89,13 +87,6 @@ int iommu_dma_supported(struct device *dev, u64 mask) | |||
| 89 | { | 87 | { |
| 90 | struct dma_mapping_ops *ops = get_dma_ops(dev); | 88 | struct dma_mapping_ops *ops = get_dma_ops(dev); |
| 91 | 89 | ||
| 92 | #ifdef CONFIG_PCI | ||
| 93 | if (mask > 0xffffffff && forbid_dac > 0) { | ||
| 94 | dev_info(dev, "Disallowing DAC for device\n"); | ||
| 95 | return 0; | ||
| 96 | } | ||
| 97 | #endif | ||
| 98 | |||
| 99 | if (ops->dma_supported_op) | 90 | if (ops->dma_supported_op) |
| 100 | return ops->dma_supported_op(dev, mask); | 91 | return ops->dma_supported_op(dev, mask); |
| 101 | 92 | ||
