Commit:     b7de8e7e3c7b79a72c20c7fd58bd65df3d146b13
Parent:     ac98695d6c1508b724f246f38ce57fb4e3cec356
Author:     Roland Dreier <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 14 00:32:53 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Feb 14 08:09:51 2007 -0800

    [PATCH] ia64: fix noncoherent DMA API so devres builds
    On ia64, drivers/base/dma-mapping.c doesn't build because it calls
    dma_alloc_noncoherent() and dma_free_noncoherent(), which appear to be
    terminally broken; the calls end up generating errors like
        drivers/base/dma-mapping.c: In function 'dmam_noncoherent_release':
        drivers/base/dma-mapping.c:32: error: 'struct ia64_machine_vector' has 
no member named 'platform_dma_free_coherent'
    because the multiple levels of macro expansion in <asm/dma-mapping.h> and
    <asm/machvec.h> end up turning a call to dma_free_noncoherent() into
    ia64_mv.platform_dma_free_coherent (instead of the intended
    This patch fixes this by converting dma_{alloc,free}_noncoherent() into
    inline functions that call the corresponding coherent functions, instead of
    trying to do this with macros.
    Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
    Acked-by: Tony Luck <[EMAIL PROTECTED]>
    Cc: Al Viro <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/asm-ia64/dma-mapping.h |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/include/asm-ia64/dma-mapping.h b/include/asm-ia64/dma-mapping.h
index ebd5887..6299b51 100644
--- a/include/asm-ia64/dma-mapping.h
+++ b/include/asm-ia64/dma-mapping.h
@@ -8,9 +8,20 @@
 #include <asm/machvec.h>
 #define dma_alloc_coherent     platform_dma_alloc_coherent
-#define dma_alloc_noncoherent  platform_dma_alloc_coherent     /* coherent 
mem. is cheap */
+/* coherent mem. is cheap */
+static inline void *
+dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
+                     gfp_t flag)
+       return dma_alloc_coherent(dev, size, dma_handle, flag);
 #define dma_free_coherent      platform_dma_free_coherent
-#define dma_free_noncoherent   platform_dma_free_coherent
+static inline void
+dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr,
+                    dma_addr_t dma_handle)
+       dma_free_coherent(dev, size, cpu_addr, dma_handle);
 #define dma_map_single         platform_dma_map_single
 #define dma_map_sg             platform_dma_map_sg
 #define dma_unmap_single       platform_dma_unmap_single
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to