1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 53bd05ea90d8..0ee0f8f34251 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -6,7 +6,7 @@
 #include <linux/init.h>
 #include <linux/swiotlb.h>
 #include <linux/bootmem.h>
-#include <linux/dma-mapping.h>
+#include <linux/dma-direct.h>
 #include <linux/mem_encrypt.h>
 
 #include <asm/iommu.h>
@@ -48,7 +48,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
                 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
 }
 
-static const struct dma_map_ops swiotlb_dma_ops = {
+static const struct dma_map_ops x86_swiotlb_dma_ops = {
         .mapping_error = swiotlb_dma_mapping_error,
         .alloc = x86_swiotlb_alloc_coherent,
         .free = x86_swiotlb_free_coherent,
@@ -112,7 +112,7 @@ void __init pci_swiotlb_init(void)
 {
         if (swiotlb) {
                 swiotlb_init(0);
-                dma_ops = &swiotlb_dma_ops;
+                dma_ops = &x86_swiotlb_dma_ops;
         }
 }
 
@@ -120,7 +120,7 @@ void __init pci_swiotlb_late_init(void)
 {
         /* An IOMMU turned us off. */
         if (!swiotlb)
-                swiotlb_free();
+                swiotlb_exit();
         else {
                 printk(KERN_INFO "PCI-DMA: "
                        "Using software bounce buffering for IO (SWIOTLB)\n");