diff options
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 3 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 8467ec2320f1..702714bd1511 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | #include <asm/calgary.h> | 9 | #include <asm/calgary.h> |
| 10 | #include <asm/amd_iommu.h> | 10 | #include <asm/amd_iommu.h> |
| 11 | 11 | ||
| 12 | int forbid_dac __read_mostly; | 12 | static int forbid_dac __read_mostly; |
| 13 | EXPORT_SYMBOL(forbid_dac); | ||
| 14 | 13 | ||
| 15 | const struct dma_mapping_ops *dma_ops; | 14 | const struct dma_mapping_ops *dma_ops; |
| 16 | EXPORT_SYMBOL(dma_ops); | 15 | EXPORT_SYMBOL(dma_ops); |
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index a1a4dc7fe6ec..c2ddd3d1b883 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h | |||
| @@ -14,7 +14,6 @@ extern dma_addr_t bad_dma_address; | |||
| 14 | extern int iommu_merge; | 14 | extern int iommu_merge; |
| 15 | extern struct device fallback_dev; | 15 | extern struct device fallback_dev; |
| 16 | extern int panic_on_overflow; | 16 | extern int panic_on_overflow; |
| 17 | extern int forbid_dac; | ||
| 18 | extern int force_iommu; | 17 | extern int force_iommu; |
| 19 | 18 | ||
| 20 | struct dma_mapping_ops { | 19 | struct dma_mapping_ops { |
