2 files changed, 20 insertions, 15 deletions

diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 63393202b9ec..1f5b7287d1ad 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -133,20 +133,8 @@ dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,
 
 #define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
 
-static inline void dma_free_attrs(struct device *dev, size_t size,
-                                  void *vaddr, dma_addr_t bus,
-                                  struct dma_attrs *attrs)
-{
-        struct dma_map_ops *ops = get_dma_ops(dev);
-
-        WARN_ON(irqs_disabled());       /* for portability */
-
-        if (dma_release_from_coherent(dev, get_order(size), vaddr))
-                return;
-
-        debug_dma_free_coherent(dev, size, vaddr, bus);
-        if (ops->free)
-                ops->free(dev, size, vaddr, bus, attrs);
-}
+void dma_free_attrs(struct device *dev, size_t size,
+                    void *vaddr, dma_addr_t bus,
+                    struct dma_attrs *attrs);
 
 #endif
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index f9f7656e1d41..353972c1946c 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -168,6 +168,23 @@ void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,
 }
 EXPORT_SYMBOL(dma_alloc_attrs);
 
+void dma_free_attrs(struct device *dev, size_t size,
+                    void *vaddr, dma_addr_t bus,
+                    struct dma_attrs *attrs)
+{
+        struct dma_map_ops *ops = get_dma_ops(dev);
+
+        WARN_ON(irqs_disabled());       /* for portability */
+
+        if (dma_release_from_coherent(dev, get_order(size), vaddr))
+                return;
+
+        debug_dma_free_coherent(dev, size, vaddr, bus);
+        if (ops->free)
+                ops->free(dev, size, vaddr, bus, attrs);
+}
+EXPORT_SYMBOL(dma_free_attrs);
+
 /*
  * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel
  * parameter documentation.